Fix crash toggling fullscreen from within the Settings menu.

See #7957
This commit is contained in:
Henrik Rydgard committed 2015-09-20 23:57:51 +02:00
1 parent fbb987a46f
commit 2dcf50cf5e
4 files changed
+9 -4

No files matched your search

+6 -2
View File
@@ -572,7 +572,7 @@ namespace MainWindow
double now = real_time_now();
if ((now - lastMouseDown) < 0.001 * GetDoubleClickTime()) {
if (!g_Config.bShowTouchControls && GetUIState() == UISTATE_INGAME) {
PostMessage(hwndMain, WM_USER_TOGGLE_FULLSCREEN, 0, 0);
SendToggleFullscreen(!g_Config.bFullScreen);
}
lastMouseDown = 0.0;
} else {
@@ -800,7 +800,7 @@ namespace MainWindow
break;
case WM_USER_TOGGLE_FULLSCREEN:
ToggleFullscreen(hwndMain, !g_Config.bFullScreen);
ToggleFullscreen(hwndMain, wParam ? true : false);
break;
case WM_INPUT:
@@ -952,4 +952,8 @@ namespace MainWindow
}
}
void SendToggleFullscreen(bool fullscreen) {
PostMessage(hwndMain, WM_USER_TOGGLE_FULLSCREEN, fullscreen, 0);
}
} // namespace
+1
View File
@@ -63,6 +63,7 @@ namespace MainWindow
HINSTANCE GetHInstance();
HWND GetDisplayHWND();
void ToggleFullscreen(HWND hWnd, bool goingFullscreen);
void SendToggleFullscreen(bool fullscreen); // To be used off-thread
void ToggleDebugConsoleVisibility();
void SetInternalResolution(int res = -1);
void SetWindowSize(int zoom);
+1 -1
View File
@@ -831,7 +831,7 @@ namespace MainWindow {
break;
case ID_OPTIONS_FULLSCREEN:
PostMessage(hWnd, WM_USER_TOGGLE_FULLSCREEN, 0, 0);
SendToggleFullscreen(!g_Config.bFullScreen);
break;
case ID_OPTIONS_VERTEXCACHE:
+1 -1
View File
@@ -330,7 +330,7 @@ bool WindowsHost::CreateDesktopShortcut(std::string argumentPath, std::string ga
}
void WindowsHost::GoFullscreen(bool viewFullscreen) {
MainWindow::ToggleFullscreen(mainWindow_, viewFullscreen);
MainWindow::SendToggleFullscreen(viewFullscreen);
}
void WindowsHost::ToggleDebugConsoleVisibility() {