Merge pull request #90538 from migueldeicaza/order

Fix the initialization order for the iOS driver
godotengine · Apr 13, 2024 · 6d5981a · 6d5981a
2 parents c889934 + 3ea7dec
commit 6d5981a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm
@@ -149,10 +149,6 @@ void register_dynamic_symbol(char *name, void *address) {
 
 void OS_IOS::set_main_loop(MainLoop *p_main_loop) {
 	main_loop = p_main_loop;
-
-	if (main_loop) {
-		main_loop->initialize();
-	}
 }
 
 MainLoop *OS_IOS::get_main_loop() const {
@@ -181,7 +177,9 @@ void register_dynamic_symbol(char *name, void *address) {
 }
 
 void OS_IOS::start() {
-	Main::start();
+	if (Main::start() == EXIT_SUCCESS) {
+		main_loop->initialize();
+	}
 
 	if (joypad_ios) {
 		joypad_ios->start_processing();