Merge pull request #90776 from Naros/avoid-script-language-not-overri…

…dden Defer call to `set_break_language`
godotengine · Apr 19, 2024 · e50867a · e50867a
2 parents 0b80421 + d0fa2c3
commit e50867a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
@@ -51,7 +51,7 @@ void Script::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_POSTINITIALIZE: {
 			if (EngineDebugger::is_active()) {
-				EngineDebugger::get_script_debugger()->set_break_language(get_language());
+				callable_mp(this, &Script::_set_debugger_break_language).call_deferred();
 			}
 		} break;
 	}
@@ -103,6 +103,12 @@ Dictionary Script::_get_script_constant_map() {
 	return ret;
 }
 
+void Script::_set_debugger_break_language() {
+	if (EngineDebugger::is_active()) {
+		EngineDebugger::get_script_debugger()->set_break_language(get_language());
+	}
+}
+
 int Script::get_script_method_argument_count(const StringName &p_method, bool *r_is_valid) const {
 	MethodInfo mi = get_method_info(p_method);
 

diff --git a/core/object/script_language.h b/core/object/script_language.h
@@ -124,6 +124,8 @@ class Script : public Resource {
 	TypedArray<Dictionary> _get_script_signal_list();
 	Dictionary _get_script_constant_map();
 
+	void _set_debugger_break_language();
+
 public:
 	virtual void reload_from_file() override;