From eb6fe823f8196373906916b47fbeecf5d7a63e8a Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sat, 25 May 2019 20:58:32 +0200
Subject: close any opened dialogs when closing the main window

---
 src/libui_sdl/main.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/libui_sdl/main.cpp')

diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
index c086bbf..0c7aacd 100644
--- a/src/libui_sdl/main.cpp
+++ b/src/libui_sdl/main.cpp
@@ -1637,11 +1637,23 @@ void UndoStateLoad()
 }
 
 
+void CloseAllDialogs()
+{
+    DlgAudioSettings::Close();
+    DlgEmuSettings::Close();
+    DlgInputConfig::Close(0);
+    DlgInputConfig::Close(1);
+    DlgVideoSettings::Close();
+    DlgWifiSettings::Close();
+}
+
+
 int OnCloseWindow(uiWindow* window, void* blarg)
 {
     EmuRunning = 3;
     while (EmuStatus != 3);
 
+    CloseAllDialogs();
     uiQuit();
     return 1;
 }
@@ -1678,6 +1690,7 @@ void OnCloseByMenu(uiMenuItem* item, uiWindow* window, void* blarg)
     EmuRunning = 3;
     while (EmuStatus != 3);
 
+    CloseAllDialogs();
     DestroyMainWindow();
     uiQuit();
 }
-- 
cgit v1.2.3