godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90538 from migueldeicaza/order

Browse Source 
Fix the initialization order for the iOS driver
This commit is contained in:
Rémi Verschelde 2024-04-13 11:30:27 +02:00
commit 6d5981aad7
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/ios/os_ios.mm
View File

@ -149,10 +149,6 @@ void OS_IOS::deinitialize_modules() {
void OS_IOS::set_main_loop(MainLoop *p_main_loop) { void OS_IOS::set_main_loop(MainLoop *p_main_loop) {
main_loop = p_main_loop; main_loop = p_main_loop;
if (main_loop) {
main_loop->initialize();
}
} }
MainLoop *OS_IOS::get_main_loop() const { MainLoop *OS_IOS::get_main_loop() const {
@ -181,7 +177,9 @@ bool OS_IOS::iterate() {
} }
void OS_IOS::start() { void OS_IOS::start() {
Main::start(); if (Main::start() == EXIT_SUCCESS) {
main_loop->initialize();
}
if (joypad_ios) { if (joypad_ios) {
joypad_ios->start_processing(); joypad_ios->start_processing();