Fix language server thread crash

godotengine · Nov 30, 2024 · e6a4c17 · e6a4c17
1 parent 77dcf97
commit e6a4c17
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -112,12 +112,23 @@ void GDScriptTextDocument::didSave(const Variant &p_param) {
 		}
 
 		scr->update_exports();
-		ScriptEditor::get_singleton()->reload_scripts(true);
-		ScriptEditor::get_singleton()->update_docs_from_script(scr);
-		ScriptEditor::get_singleton()->trigger_live_script_reload(scr->get_path());
+
+		if ((bool)_EDITOR_GET("network/language_server/use_thread")) {
+			// its not safe to call "reload_scripts" from the currrent thread, so it needs to be deferred
+			// otherwise it will randomly cause a crash.
+			(callable_mp(this, &GDScriptTextDocument::reload_script)).call_deferred(scr);
+		} else {
+			reload_script(scr);
+		}
 	}
 }
 
+void GDScriptTextDocument::reload_script(Ref<GDScript> to_reload_script) {
+	ScriptEditor::get_singleton()->reload_scripts(true);
+	ScriptEditor::get_singleton()->update_docs_from_script(to_reload_script);
+	ScriptEditor::get_singleton()->trigger_live_script_reload(to_reload_script->get_path());
+}
+
 lsp::TextDocumentItem GDScriptTextDocument::load_document_item(const Variant &p_param) {
 	lsp::TextDocumentItem doc;
 	Dictionary params = p_param;

diff --git a/modules/gdscript/language_server/gdscript_text_document.h b/modules/gdscript/language_server/gdscript_text_document.h
@@ -35,6 +35,7 @@
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
+#include "modules/gdscript/gdscript.h"
 
 class GDScriptTextDocument : public RefCounted {
 	GDCLASS(GDScriptTextDocument, RefCounted)
@@ -49,6 +50,7 @@ class GDScriptTextDocument : public RefCounted {
 	void willSaveWaitUntil(const Variant &p_param);
 	void didSave(const Variant &p_param);
 
+	void reload_script(Ref<GDScript> to_reload_script);
 	void sync_script_content(const String &p_path, const String &p_content);
 	void show_native_symbol_in_editor(const String &p_symbol_id);