X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fgl-view%2Fdrawable-view-impl.cpp;h=be66265d64f84c489d46b61b5d1435fdbe1c0856;hb=HEAD;hp=01b84f76044f1b0be48ba3115e70999e4983b08e;hpb=5c53bc6e76a1633a69c1a3d30c63677772eb3fd6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp b/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp
index 01b84f7..be66265 100644
--- a/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp
+++ b/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp
@@ -151,6 +151,7 @@ void DrawableView::OnSceneConnection(int depth)
   // the designed behaviour of GlView so signal is connected regardless
   if(window)
   {
+    mPlacementWindow = window;
     DevelWindow::VisibilityChangedSignal(window).Connect(this, &DrawableView::OnWindowVisibilityChanged);
   }
 }
@@ -160,6 +161,13 @@ void DrawableView::OnSceneDisconnection()
   Control::OnSceneDisconnection();
 
   mNativeRenderer->Terminate();
+
+  Window window = mPlacementWindow.GetHandle();
+  if(window)
+  {
+    DevelWindow::VisibilityChangedSignal(window).Disconnect(this, &DrawableView::OnWindowVisibilityChanged);
+    mPlacementWindow.Reset();
+  }
 }
 
 void DrawableView::AddRenderer()