diff options
| author | Juan Linietsky <juan@godotengine.org> | 2019-02-27 11:00:11 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2019-02-27 11:00:32 -0300 |
| commit | eb2b9b88a965ee4b2647680d93bb931626376597 (patch) | |
| tree | 3c1cf5595e613a4b0f3d1d706481fdebcbfd4d03 | |
| parent | 36de6c1e3c08a30a7579148ee5d2f8ed8021de42 (diff) | |
Make sure restoring opened scenes happens after scanning is done.
| -rw-r--r-- | editor/editor_node.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index dcab17041f..754e8956a1 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -291,6 +291,8 @@ void EditorNode::_notification(int p_what) { get_tree()->get_root()->set_as_audio_listener_2d(false); get_tree()->set_auto_accept_quit(false); get_tree()->connect("files_dropped", this, "_dropped_files"); + + /* DO NOT LOAD SCENES HERE, WAIT FOR FILE SCANNING AND REIMPORT TO COMPLETE */ } if (p_what == NOTIFICATION_EXIT_TREE) { @@ -305,7 +307,8 @@ void EditorNode::_notification(int p_what) { _editor_select(EDITOR_3D); _update_debug_options(); - _load_docks(); + + /* DO NOT LOAD SCENES HERE, WAIT FOR FILE SCANNING AND REIMPORT TO COMPLETE */ } if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) { @@ -528,6 +531,8 @@ void EditorNode::_sources_changed(bool p_exist) { if (waiting_for_first_scan) { + _load_docks(); + if (defer_load_scene != "") { load_scene(defer_load_scene); |