close any opened dialogs when closing the main window

src/libui_sdl/DlgAudioSettings.cpp

@@ -180,4 +180,11 @@ void Open()
     uiControlShow(uiControl(win));
 }
 
+void Close()
+{
+    if (!opened) return;
+    uiControlDestroy(uiControl(win));
+    opened = false;
+}
+
 }

src/libui_sdl/DlgAudioSettings.h

@@ -23,6 +23,7 @@ namespace DlgAudioSettings
 {
 
 void Open();
+void Close();
 
 }
 

src/libui_sdl/DlgEmuSettings.cpp

@@ -107,4 +107,11 @@ void Open()
     uiControlShow(uiControl(win));
 }
 
+void Close()
+{
+    if (!opened) return;
+    uiControlDestroy(uiControl(win));
+    opened = false;
+}
+
 }

src/libui_sdl/DlgEmuSettings.h

@@ -23,6 +23,7 @@ namespace DlgEmuSettings
 {
 
 void Open();
+void Close();
 
 }
 

src/libui_sdl/DlgInputConfig.cpp

@@ -450,5 +450,13 @@ void Open(int type)
     uiControlShow(uiControl(dlg->win));
 }
 
+void Close(int type)
+{
+    if (openedmask & (1<<type))
+        uiControlDestroy(uiControl(inputdlg[type].win));
+
+    openedmask &= ~(1<<type);
+}
+
 }
 

src/libui_sdl/DlgInputConfig.h

@@ -23,6 +23,7 @@ namespace DlgInputConfig
 {
 
 void Open(int type);
+void Close(int type);
 
 }
 

src/libui_sdl/DlgVideoSettings.cpp

@@ -306,4 +306,11 @@ void Open()
     uiControlShow(uiControl(win));
 }
 
+void Close()
+{
+    if (!opened) return;
+    uiControlDestroy(uiControl(win));
+    opened = false;
+}
+
 }

src/libui_sdl/DlgVideoSettings.h

@@ -23,6 +23,7 @@ namespace DlgVideoSettings
 {
 
 void Open();
+void Close();
 
 }
 

src/libui_sdl/DlgWifiSettings.cpp

@@ -261,4 +261,11 @@ void Open()
     uiControlShow(uiControl(win));
 }
 
+void Close()
+{
+    if (!opened) return;
+    uiControlDestroy(uiControl(win));
+    opened = false;
+}
+
 }

src/libui_sdl/DlgWifiSettings.h

@@ -23,6 +23,7 @@ namespace DlgWifiSettings
 {
 
 void Open();
+void Close();
 
 }
 

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();
 }