mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 13:49:54 +00:00
Merge pull request #112663 from nikitalita/script-editor-fix
ScriptEditor::reload_scripts: only call deferred if not main thread
This commit is contained in:
commit
ef34c3d534
1 changed files with 5 additions and 1 deletions
|
|
@ -2821,7 +2821,11 @@ void ScriptEditor::apply_scripts() const {
|
||||||
|
|
||||||
void ScriptEditor::reload_scripts(bool p_refresh_only) {
|
void ScriptEditor::reload_scripts(bool p_refresh_only) {
|
||||||
// Call deferred to make sure it runs on the main thread.
|
// Call deferred to make sure it runs on the main thread.
|
||||||
callable_mp(this, &ScriptEditor::_reload_scripts).call_deferred(p_refresh_only);
|
if (!Thread::is_main_thread()) {
|
||||||
|
callable_mp(this, &ScriptEditor::_reload_scripts).call_deferred(p_refresh_only);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_reload_scripts(p_refresh_only);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScriptEditor::_reload_scripts(bool p_refresh_only) {
|
void ScriptEditor::_reload_scripts(bool p_refresh_only) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue