Fix shutdown because of Discord deinitializer

https://github.com/hrydgard/ppsspp/blob/f94beb518504eebadb94dfdc009cf9f4461bc6a4/UI/DiscordIntegration.cpp#L40 Calling exit(0) without NativeShutdown() breaks the assertion.
imxieyi · Jun 11, 2019 · 1affe0b · 1affe0b
1 parent 364b447
commit 1affe0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ios/ViewController.mm b/ios/ViewController.mm
@@ -213,14 +213,15 @@ - (void)viewDidLoad {
 			time_update();
 		}
 
-		threadStopped = true;
 
 		ILOG("Emulation thread shutting down\n");
 		NativeShutdownGraphics();
 
 		// Also ask the main thread to stop, so it doesn't hang waiting for a new frame.
 		ILOG("Emulation thread stopping\n");
 		graphicsContext->StopThread();
+
+		threadStopped = true;
 	});
 }
 

diff --git a/ios/main.mm b/ios/main.mm
@@ -61,7 +61,10 @@ bool System_GetPropertyBool(SystemProperty prop) {
 
 void System_SendMessage(const char *command, const char *parameter) {
 	if (!strcmp(command, "finish")) {
-		exit(0);
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[sharedViewController shutdown];
+			exit(0);
+		});
 	}
 }