3 files changed, 6 insertions, 3 deletions
diff --git a/src/Daemon/BoxDaemonImpl.cpp b/src/Daemon/BoxDaemonImpl.cpp
index a262929..3ff24ba 100755
--- a/src/Daemon/BoxDaemonImpl.cpp
+++ b/src/Daemon/BoxDaemonImpl.cpp
@@ -719,7 +719,7 @@ int BoxDaemonImpl::requestLowMemoryCallback(void* data)
     UNUSED_PARAM(data);
 
     // terminate box daemon and revive
-    aul_terminate_pid(getpid());
+    elm_exit();
     return 0;
 }
 
diff --git a/src/Daemon/main.cpp b/src/Daemon/main.cpp
index e3d144a..1b8863d 100755
--- a/src/Daemon/main.cpp
+++ b/src/Daemon/main.cpp
@@ -87,7 +87,7 @@ static void appServiceCallback(service_h service, void *data)
         std::string daemonName(name);
         if(!(boxDaemon->start(daemonName))) {
             LogD("daemon failed to start");
-            aul_terminate_pid(getpid());
+            elm_exit();
         }
         atexit(atExitCallback);
         return;
diff --git a/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp b/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
index 72113d6..891e5bb 100755
--- a/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
+++ b/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
@@ -90,6 +90,9 @@ AppBoxRenderView::AppBoxRenderView(
 AppBoxRenderView::~AppBoxRenderView()
 {
     LogD("enter");
+
+    destroyWrtCore(m_boxWrt);
+    destroyWrtCore(m_pdWrt);
     AppBoxObserver::Instance()->unregisterRenderView(m_instanceId);
 }
 
@@ -646,7 +649,7 @@ void AppBoxRenderView::decideNavigationCallback(Evas_Object* webview, std::strin
 void AppBoxRenderView::crashWebProcessCallback()
 {
     LogD("enter");
-    aul_terminate_pid(getpid());
+    elm_exit();
 }
 
 void AppBoxRenderView::loadNonEmptyLayoutFinishedCallback(