godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42677 from groud/fix_error_on_attach_script

Browse Source 
Fix error on attaching script
This commit is contained in:
Rémi Verschelde 2020-10-27 00:23:50 +01:00 committed by GitHub
commit 47e9fc22c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/scene_tree_dock.cpp
View File

@ -1762,6 +1762,8 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
void SceneTreeDock::_script_creation_closed() { void SceneTreeDock::_script_creation_closed() {
script_create_dialog->disconnect("script_created", callable_mp(this, &SceneTreeDock::_script_created)); script_create_dialog->disconnect("script_created", callable_mp(this, &SceneTreeDock::_script_created));
script_create_dialog->disconnect("confirmed", callable_mp(this, &SceneTreeDock::_script_creation_closed));
script_create_dialog->disconnect("cancelled", callable_mp(this, &SceneTreeDock::_script_creation_closed));
} }
void SceneTreeDock::_toggle_editable_children_from_selection() { void SceneTreeDock::_toggle_editable_children_from_selection() {
@ -2651,7 +2653,8 @@ void SceneTreeDock::attach_script_to_selected(bool p_extend) {
} }
script_create_dialog->connect("script_created", callable_mp(this, &SceneTreeDock::_script_created)); script_create_dialog->connect("script_created", callable_mp(this, &SceneTreeDock::_script_created));
script_create_dialog->connect("popup_hide", callable_mp(this, &SceneTreeDock::_script_creation_closed), varray(), CONNECT_ONESHOT); script_create_dialog->connect("confirmed", callable_mp(this, &SceneTreeDock::_script_creation_closed));
script_create_dialog->connect("cancelled", callable_mp(this, &SceneTreeDock::_script_creation_closed));
script_create_dialog->set_inheritance_base_type("Node"); script_create_dialog->set_inheritance_base_type("Node");
script_create_dialog->config(inherits, path); script_create_dialog->config(inherits, path);
script_create_dialog->popup_centered(); script_create_dialog->popup_centered();