claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

Browse Source
This commit is contained in:
OBattler
2021-09-19 14:47:15 +02:00
parent bb39e53fee 2ee154c362
commit 273e1a4cbe
5 changed files with 187 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/win.c
View File

@@ -1051,7 +1051,7 @@ plat_setfullscreen(int on)
if ((!!(on & 1)) == (!!video_fullscreen))
return;
if (on && (start_in_fullscreen || video_fullscreen_first)) {
if (on && video_fullscreen_first) {
video_fullscreen |= 2;
if (ui_msgbox_header(MBX_INFO | MBX_DONTASK, (wchar_t *) IDS_2134, (wchar_t *) IDS_2052) == 10) {
video_fullscreen_first = 0;

4
src/win/win_ui.c
View File

@@ -1427,7 +1427,7 @@ ui_init(int nCmdShow)
}
/* Initialize the mouse module. */
if (!start_in_fullscreen && !video_fullscreen_first)
if (!start_in_fullscreen)
win_mouse_init();
/*
@@ -1459,7 +1459,7 @@ ui_init(int nCmdShow)
plat_resize(scrnsz_x, scrnsz_y);
/* Initialize the rendering window, or fullscreen. */
if (start_in_fullscreen || video_fullscreen_first)
if (start_in_fullscreen)
plat_setfullscreen(3);
/* Fire up the machine. */