summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-09-15 15:10:56 +0200
committerGitHub <noreply@github.com>2018-09-15 15:10:56 +0200
commit2cf024ed916abf565011b254ea4f69c04781964c (patch)
tree40fe0b7f649a6fcd94c7d1870b533484ae14b0c4 /editor
parent82e69f38eeb4a41f74527248bf257ba50d375870 (diff)
parentebd518c9c9357dd2d6eee62ef1623bb694279aad (diff)
Merge pull request #22069 from scayze/fix_reload_scripts
Fix scripts not reloading when edited externally
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/script_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index 9dd6a8e0ed..e155daa2fa 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -797,7 +797,7 @@ bool ScriptEditor::_test_script_times_on_disk(RES p_for_script) {
if (se) {
RES edited_res = se->get_edited_resource();
- if (edited_res.is_valid() && p_for_script != edited_res)
+ if (p_for_script.is_valid() && edited_res.is_valid() && p_for_script != edited_res)
continue;
if (edited_res->get_path() == "" || edited_res->get_path().find("local://") != -1 || edited_res->get_path().find("::") != -1)