Cocoa Port: Fix a longstanding, yet rare, crash that may occur when q…

…uitting the app.
TASEmulators · Jul 2, 2024 · fe0ae83 · fe0ae83
1 parent d4163a1
commit fe0ae83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/desmume/src/frontend/cocoa/cocoa_GPU.mm b/desmume/src/frontend/cocoa/cocoa_GPU.mm
@@ -193,8 +193,6 @@ - (id)init
 
 - (void)dealloc
 {
-	DestroyOpenGLRenderer();
-
 	delete fetchObject;
 	delete gpuEvent;
 

diff --git a/desmume/src/frontend/cocoa/cocoa_core.mm b/desmume/src/frontend/cocoa/cocoa_core.mm
@@ -226,6 +226,10 @@ - (void)dealloc
 	delete execControl;
 	NDS_DeInit();
 
+	// We must call DestroyOpenGLRenderer() after NDS_Init() because we need to wait for
+	// the OpenGL renderer to finish before we destroy its associated context.
+	DestroyOpenGLRenderer();
+
 	[super dealloc];
 }