From 3fd7fabb98c21c17e258bdd3aacf49d57e91d727 Mon Sep 17 00:00:00 2001 From: elasota Date: Tue, 21 Jul 2020 12:23:13 -0400 Subject: [PATCH] Fix full-screen being disabled when going to preferences but not viewing display options --- GpApp/Settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GpApp/Settings.cpp b/GpApp/Settings.cpp index b20e317..01de43d 100644 --- a/GpApp/Settings.cpp +++ b/GpApp/Settings.cpp @@ -918,8 +918,6 @@ void DisplayUpdate (Dialog *theDialog) SetDialogItemValue(theDialog, k32BitColorItem, wasDepthPref == 32); SetDialogItemValue(theDialog, kScaleResolutionItem, (short)isAutoScale); SetDialogItemValue(theDialog, kUseICCProfileItem, (short)isUseICCProfile); - - wasFullscreenPref = PortabilityLayer::HostDisplayDriver::GetInstance()->IsFullScreen(); SetDialogItemValue(theDialog, kFullScreenItem, wasFullscreenPref); FrameDisplayIcon(theDialog, StdColors::Red()); @@ -1286,6 +1284,8 @@ void DoSettingsMain (void) leaving = false; nextRestartChange = false; + wasFullscreenPref = PortabilityLayer::HostDisplayDriver::GetInstance()->IsFullScreen(); + Window* exclWindow = prefDlg->GetWindow(); PortabilityLayer::WindowManager::GetInstance()->SwapExclusiveWindow(exclWindow); // Push exclusive window