From a491b3a35c910b094f5383bc238509585bea3091 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 18 Sep 2021 21:33:13 +0200 Subject: [PATCH] Reverted the meaning of video_fullscreen_first to what it used to be. --- src/config.c | 3 ++- src/win/win.c | 2 +- src/win/win_ui.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index 6d26fe9c6..ec2a19839 100644 --- a/src/config.c +++ b/src/config.c @@ -505,7 +505,7 @@ load_general(void) video_fullscreen_scale = config_get_int(cat, "video_fullscreen_scale", 0); - video_fullscreen_first = config_get_int(cat, "video_fullscreen_first", 0); + video_fullscreen_first = config_get_int(cat, "video_fullscreen_first", 1); video_filter_method = config_get_int(cat, "video_filter_method", 1); @@ -2018,6 +2018,7 @@ config_load(void) gfxcard = video_get_video_from_internal_name("cga"); vid_api = plat_vidapi("default"); vid_resize = 0; + video_fullscreen_first = 1; time_sync = TIME_SYNC_ENABLED; hdc_current = hdc_get_from_internal_name("none"); serial_enabled[0] = 1; diff --git a/src/win/win.c b/src/win/win.c index 6d7cc86f9..45d32bd8e 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -1050,7 +1050,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; diff --git a/src/win/win_ui.c b/src/win/win_ui.c index a778d60e7..6a38045c9 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -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. */