Fix crash issue

- Delete Clipboard::Impl
- Change delete order: Adaptor should be deleted before Framework

Change-Id: Id2e793e7206f66ce397a1b4ed1cde970866e4a2b

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index 8dd7597..931ba12 100644 (file)
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -102,10 +102,10 @@ Application::~Application()
 {
   mSingletonService.UnregisterAll();
 
-  delete mFramework;
-  delete mCommandLineOptions;
-  delete mAdaptor;
   mWindow.Reset();
+  delete mAdaptor;
+  delete mCommandLineOptions;
+  delete mFramework;
 }
 
 void Application::CreateWindow()

diff --git a/adaptors/ecore/wayland/clipboard-impl-ecore-wl.cpp b/adaptors/ecore/wayland/clipboard-impl-ecore-wl.cpp
index 19e040b..b19af9b 100644 (file)
--- a/adaptors/ecore/wayland/clipboard-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/clipboard-impl-ecore-wl.cpp
@@ -218,6 +218,7 @@ Clipboard::Clipboard(Impl* impl)
 
 Clipboard::~Clipboard()
 {
+  delete mImpl;
 }
 
 Dali::Clipboard Clipboard::Get()

diff --git a/adaptors/wayland/clipboard/clipboard-impl-wl.cpp b/adaptors/wayland/clipboard/clipboard-impl-wl.cpp
index 611ddf3..63588a4 100644 (file)
--- a/adaptors/wayland/clipboard/clipboard-impl-wl.cpp
+++ b/adaptors/wayland/clipboard/clipboard-impl-wl.cpp
@@ -55,6 +55,7 @@ Clipboard::Clipboard(Impl* impl)
 
 Clipboard::~Clipboard()
 {
+  delete mImpl;
 }
 
 Dali::Clipboard Clipboard::Get()