From b82e85f9fc4786de9b73bcb42de1effb24515866 Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 11 Apr 2014 14:18:27 -0400 Subject: [PATCH] Win32: Properly shutdown when using File->Exit, or when g_Config.bEscapeExitsEmulator is true. --- Windows/RawInput.cpp | 2 +- Windows/WndMainWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp index 92a5faa249..343a1479d1 100644 --- a/Windows/RawInput.cpp +++ b/Windows/RawInput.cpp @@ -119,7 +119,7 @@ namespace WindowsRawInput { } if (g_Config.bEscapeExitsEmulator && raw->data.keyboard.VKey == VK_ESCAPE) { - DestroyWindow(MainWindow::GetHWND()); + PostMessage(MainWindow::GetHWND(), WM_CLOSE, 0, 0); return; } diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 03a87151b4..b209a71e08 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1316,7 +1316,7 @@ namespace MainWindow break; case ID_FILE_EXIT: - DestroyWindow(hWnd); + PostMessage(hwndMain, WM_CLOSE, 0, 0); break; case ID_DEBUG_RUNONLOAD: