fix OpenGL deinit when closing emu

melonDS-emu · Jun 25, 2019 · 4d775dc · 4d775dc
1 parent 1d8902c
commit 4d775dc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
@@ -1049,6 +1049,12 @@ int EmuThreadFunc(void* burp)
     return 44203;
 }
 
+void StopEmuThread()
+{
+    EmuRunning = 0;
+    SDL_WaitThread(EmuThread, NULL);
+}
+
 
 void OnAreaDraw(uiAreaHandler* handler, uiArea* area, uiAreaDrawParams* params)
 {
@@ -1856,6 +1862,7 @@ int OnCloseWindow(uiWindow* window, void* blarg)
     while (EmuStatus != 3);
 
     CloseAllDialogs();
+    StopEmuThread();
     uiQuit();
     return 1;
 }
@@ -1893,6 +1900,7 @@ void OnCloseByMenu(uiMenuItem* item, uiWindow* window, void* blarg)
     while (EmuStatus != 3);
 
     CloseAllDialogs();
+    StopEmuThread();
     DestroyMainWindow();
     uiQuit();
 }
@@ -2691,9 +2699,6 @@ int main(int argc, char** argv)
 
     uiMain();
 
-    EmuRunning = 0;
-    SDL_WaitThread(EmuThread, NULL);
-
     if (Joystick) SDL_JoystickClose(Joystick);
     if (AudioDevice) SDL_CloseAudioDevice(AudioDevice);
     if (MicDevice)   SDL_CloseAudioDevice(MicDevice);