asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Avoid docks to be overriden while scanning, fixes #26359

Browse source
This commit is contained in:
Juan Linietsky 2019-02-27 18:14:24 -03:00
parent ed37408907
commit d8f12c4343
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_node.cpp
View file

@ -530,6 +530,7 @@ void EditorNode::_resources_reimported(const Vector<String> &p_resources) {
void EditorNode::_sources_changed(bool p_exist) { void EditorNode::_sources_changed(bool p_exist) {
if (waiting_for_first_scan) { if (waiting_for_first_scan) {
waiting_for_first_scan = false;
EditorResourcePreview::get_singleton()->start(); //start previes now that it's safe 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); load_scene(defer_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() { void EditorNode::_save_docks() {
if (waiting_for_first_scan) {
return; //scanning, do not touch docks
}
Ref<ConfigFile> config; Ref<ConfigFile> config;
config.instance(); config.instance();