summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-03-14 17:42:42 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-03-14 17:42:42 +0100
commitbb22db570421f8cece3507e91cf1769145df52dc (patch)
treed5061b5c7e745c6c0fd16fabb94c4631ba847838 /tools
parentc30bebd1d3d10f705eae339a684e439edc052195 (diff)
parentcb7db2d4302654312cb1de75597e498353bf8ae2 (diff)
Merge pull request #4052 from TheHX/issue-4048
Fix crash when importing sub-scenes
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_sub_scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp
index a1a881bec5..c5a4f6d58b 100644
--- a/tools/editor/editor_sub_scene.cpp
+++ b/tools/editor/editor_sub_scene.cpp
@@ -219,7 +219,7 @@ EditorSubScene::EditorSubScene() {
tree = memnew( Tree );
tree->set_v_size_flags(SIZE_EXPAND_FILL);
vb->add_margin_child("Import From Node:",tree,true);
- tree->connect("item_activated",this,"_ok");
+ tree->connect("item_activated",this,"_ok",make_binds(),CONNECT_DEFERRED);
file_dialog = memnew( EditorFileDialog );
List<String> extensions;