diff options
author | James McLean <jrimclean@gmail.com> | 2015-06-21 23:15:58 -0400 |
---|---|---|
committer | James McLean <jrimclean@gmail.com> | 2015-06-21 23:15:58 -0400 |
commit | 4e3ec18f7e0794900974f70de4e293838d48c9fe (patch) | |
tree | 52048d583a1881a8056a6cd50aab2f6e833eb241 /tools/editor/reparent_dialog.cpp | |
parent | 86c87ee66ab8601f081c89e8d85c75003b50ff78 (diff) | |
parent | 37af8b413674936518a2ebe180f9e7bfcd5795bb (diff) |
Merge branch 'master' of github.com:okamstudio/godot into development
Diffstat (limited to 'tools/editor/reparent_dialog.cpp')
-rw-r--r-- | tools/editor/reparent_dialog.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/editor/reparent_dialog.cpp b/tools/editor/reparent_dialog.cpp index d35316f67f..6d0c5b867e 100644 --- a/tools/editor/reparent_dialog.cpp +++ b/tools/editor/reparent_dialog.cpp @@ -41,6 +41,11 @@ void ReparentDialog::_notification(int p_what) { connect("confirmed", this,"_reparent"); } + if (p_what==NOTIFICATION_EXIT_TREE) { + + disconnect("confirmed", this,"_reparent"); + } + if (p_what==NOTIFICATION_DRAW) { //RID ci = get_canvas_item(); |