summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-07-05 00:53:00 +0200
committerGitHub <noreply@github.com>2020-07-05 00:53:00 +0200
commit854e9d48edd974787ac187ddb89b927276686aae (patch)
treec5c1a7c4cac88f593ac5e9ea2bb98e603a026c50
parentc2a0bfa95beb618d500e8346929bc9edb825e1c7 (diff)
parent759fef5401f7898a12cb5efcc50f7ed572e3a3ed (diff)
Merge pull request #40119 from nekomatata/fix-startup-import-crash
Fix crash on project files import in EditorFileSystem
-rw-r--r--editor/editor_file_system.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 9ca3d387d9..e367ed4989 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -1107,7 +1107,7 @@ void EditorFileSystem::_notification(int p_what) {
_queue_update_script_classes();
first_scan = false;
}
- } else if (!scanning) {
+ } else if (!scanning && thread) {
set_process(false);
if (filesystem) {