From 4866713bc3ab58cd22ef5090a75b8a20e3b35e7d Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Mon, 13 Jun 2016 21:37:04 -0300
Subject: added a function CanvasItem.get_item_and_children_rect() , fixes
 #4738

---
 scene/gui/control.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'scene/gui/control.cpp')

diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 534bcbf16..b122ab418 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -447,7 +447,7 @@ void Control::_notification(int p_notification) {
 
 
 				Node *parent=this; //meh
-				Node *parent_control=NULL;
+				Control *parent_control=NULL;
 				bool subwindow=false;
 
 				while(parent) {
@@ -463,8 +463,9 @@ void Control::_notification(int p_notification) {
 						break;
 					}
 
-					if (parent->cast_to<Control>()) {
-						parent_control=parent->cast_to<Control>();
+					parent_control=parent->cast_to<Control>();
+
+					if (parent_control) {
 						break;
 					} else if (ci) {
 
-- 
cgit v1.2.3-70-g09d2