From a5b7cc2302eb6976015b9f86d2d9246a6318d0a0 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Thu, 12 May 2016 14:45:42 +0900 Subject: [PATCH] Remove abort handler registration and change terminate callback Change-Id: I73c221c5a97cbba1fd38cd7629f10e1659f523aa --- adaptors/common/application-impl.cpp | 6 +++--- adaptors/tizen/framework-tizen.cpp | 7 ------- adaptors/ubuntu/framework-ubuntu.cpp | 7 +------ 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index ee1158b..87daa3c 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -160,9 +160,6 @@ void Application::QuitFromMainLoop() { mAdaptor->Stop(); - Dali::Application application(this); - mTerminateSignal.Emit( application ); - mFramework->Quit(); // This will trigger OnTerminate(), below, after the main loop has completed. } @@ -221,6 +218,9 @@ void Application::OnTerminate() // we've been told to quit by AppCore, ecore_x_destroy has been called, need to quit synchronously // delete the window as ecore_x has been destroyed by AppCore + Dali::Application application(this); + mTerminateSignal.Emit( application ); + if( mAdaptor ) { // Ensure that the render-thread is not using the surface(window) after we delete it diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp index 3ef3fa2..1d7450e 100644 --- a/adaptors/tizen/framework-tizen.cpp +++ b/adaptors/tizen/framework-tizen.cpp @@ -377,13 +377,6 @@ bool Framework::AppStatusHandler(int type, void *bundleData) { mInitialised = true; - // Connect to abnormal exit signals - mAbortHandler.AbortOnSignal( SIGINT ); - mAbortHandler.AbortOnSignal( SIGQUIT ); - mAbortHandler.AbortOnSignal( SIGKILL ); - mAbortHandler.AbortOnSignal( SIGTERM ); - mAbortHandler.AbortOnSignal( SIGHUP ); - mObserver.OnInit(); break; } diff --git a/adaptors/ubuntu/framework-ubuntu.cpp b/adaptors/ubuntu/framework-ubuntu.cpp index 1edd301..cb7252b 100644 --- a/adaptors/ubuntu/framework-ubuntu.cpp +++ b/adaptors/ubuntu/framework-ubuntu.cpp @@ -220,11 +220,6 @@ bool Framework::AppStatusHandler(int type, void *bundleData) { mInitialised = true; - // Connect to abnormal exit signals - mAbortHandler.AbortOnSignal( SIGINT ); - mAbortHandler.AbortOnSignal( SIGQUIT ); - mAbortHandler.AbortOnSignal( SIGKILL ); - mObserver.OnInit(); break; } @@ -238,7 +233,7 @@ bool Framework::AppStatusHandler(int type, void *bundleData) break; case APP_TERMINATE: - mObserver.OnTerminate(); + mObserver.OnTerminate(); break; case APP_PAUSE: -- 2.7.4