Răsfoiți Sursa

Make sure restoring opened scenes happens after scanning is done.

Juan Linietsky 6 ani în urmă
părinte
comite
eb2b9b88a9
1 a modificat fișierele cu 6 adăugiri și 1 ștergeri
  1. 6 1
      editor/editor_node.cpp

+ 6 - 1
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);