diff options
| -rwxr-xr-x | packaging/livebox.web-provider.spec | 2 | ||||
| -rwxr-xr-x | src/Daemon/BoxDaemonImpl.cpp | 2 | ||||
| -rwxr-xr-x | src/Daemon/main.cpp | 2 | ||||
| -rwxr-xr-x | src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/packaging/livebox.web-provider.spec b/packaging/livebox.web-provider.spec index a81b15e..a4b60a4 100755 --- a/packaging/livebox.web-provider.spec +++ b/packaging/livebox.web-provider.spec @@ -1,7 +1,7 @@ #git:framework/web/web-provider Name: livebox.web-provider Summary: web framework for livebox -Version: 1.63 +Version: 1.64 Release: 1 Group: main/app License: Flora License, Version 1.1 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( |