From d8f12c4343f38616dcefede678f6a7c8036d85de Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 27 Feb 2019 18:14:24 -0300 Subject: Avoid docks to be overriden while scanning, fixes #26359 --- editor/editor_node.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'editor') diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 67fba4f278..09117ace90 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -530,6 +530,7 @@ void EditorNode::_resources_reimported(const Vector &p_resources) { void EditorNode::_sources_changed(bool p_exist) { if (waiting_for_first_scan) { + waiting_for_first_scan = false; EditorResourcePreview::get_singleton()->start(); //start previes now that it's safe @@ -540,8 +541,6 @@ void EditorNode::_sources_changed(bool p_exist) { load_scene(defer_load_scene); defer_load_scene = ""; } - - waiting_for_first_scan = false; } } @@ -3653,6 +3652,9 @@ void EditorNode::_dock_select_draw() { void EditorNode::_save_docks() { + if (waiting_for_first_scan) { + return; //scanning, do not touch docks + } Ref config; config.instance(); -- cgit v1.2.3