mirror of
https://github.com/godotengine/godot.git
synced 2024-11-22 04:06:14 +00:00
Fix the initialization order for the iOS driver
The problem is that we were initializating the main loop (SceneTree) when we were supposed to just set it. Which would cascade into a series of issues, including having the EditorNode being flagged as "inside_tree" and having a tree, before it was supposed to. This meant that some code would assume it was fully initialized, when it was not. And this manifested as the project not being scanned for resources, which meant that during the importing, the resources would not match using the uid path, and produce lots of errors. One line fix
This commit is contained in:
parent
029aadef56
commit
3ea7dec7d3
@ -149,10 +149,6 @@ void OS_IOS::deinitialize_modules() {
|
||||
|
||||
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 @@ bool OS_IOS::iterate() {
|
||||
}
|
||||
|
||||
void OS_IOS::start() {
|
||||
Main::start();
|
||||
if (Main::start() == EXIT_SUCCESS) {
|
||||
main_loop->initialize();
|
||||
}
|
||||
|
||||
if (joypad_ios) {
|
||||
joypad_ios->start_processing();
|
||||
|
Loading…
Reference in New Issue
Block a user