[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / gl-view / drawable-view-impl.cpp

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 (file)
--- 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()