Fix reloading scripts already in use

Hilderin · Sep 18, 2024 · fafc608 · fafc608
1 parent 694d3c2
commit fafc608
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
@@ -191,7 +191,9 @@ void Script::reload_from_file() {
  set_source_code(rel->get_source_code());
  set_last_modified_time(rel->get_last_modified_time());
 
- reload();
+ // It's important to set p_keep_state to true in order to manage reloading tool scripts
+ // that are currently instantiated.
+ reload(true);
 #else
  Resource::reload_from_file();
 #endif

diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
@@ -1979,7 +1979,14 @@ void EditorFileSystem::_update_script_documentation() {
  // editor without being connected to the LSP server.
  Ref<Resource> res = ResourceCache::get_ref(path);
  if (res.is_valid()) {
- res->reload_from_file();
+ Ref<Script> scr = res;
+ if (scr.is_valid()) {
+ // Scripts are reloaded via the script editor if they are currently opened.
+ if (ScriptEditor::get_singleton()->get_open_scripts().has(scr)) {
+ continue;
+ }
+ scr->reload_from_file();
+ }
  }
  Ref<Script> scr = ResourceLoader::load(path);
  if (scr.is_null()) {