From: Heeyong Song <heeyong.song@samsung.com>
Date: Wed, 9 Aug 2017 12:53:29 +0000 (+0900)
Subject: Fix egl surface crash
X-Git-Tag: dali_1.2.53~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F143393%2F4;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Fix egl surface crash

Change-Id: I6fea3d23d30396a96bdc0f55ffeca122455da1bb
---

diff --git a/adaptors/base/render-helper.cpp b/adaptors/base/render-helper.cpp
index 9ef0ee9..c77d2c9 100644
--- a/adaptors/base/render-helper.cpp
+++ b/adaptors/base/render-helper.cpp
@@ -79,9 +79,6 @@ void RenderHelper::Stop()
   {
     // Tell surface we have stopped rendering
     mSurface->StopRender();
-
-    // The surface will be destroyed soon; this pointer will become invalid
-    mSurface = NULL;
   }
 }
 
@@ -140,6 +137,8 @@ void RenderHelper::ShutdownEgl()
   {
     // give a chance to destroy the OpenGL surface that created externally
     mSurface->DestroyEglSurface( *mEGL );
+
+    mSurface = NULL;
   }
 
   // delete the GL context / egl surface
diff --git a/adaptors/ecore/wayland/render-surface-ecore-wl.cpp b/adaptors/ecore/wayland/render-surface-ecore-wl.cpp
index 02a8eab..2db6f23 100644
--- a/adaptors/ecore/wayland/render-surface-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/render-surface-ecore-wl.cpp
@@ -83,6 +83,10 @@ void EcoreWlRenderSurface::Init( Any surface )
 
 EcoreWlRenderSurface::~EcoreWlRenderSurface()
 {
+  if( mOwnSurface )
+  {
+    ecore_wl_shutdown();
+  }
 }
 
 void EcoreWlRenderSurface::SetRenderNotification(TriggerEventInterface* renderNotification)