ui_app_exit() called twice when viewmgr terminated.

ui_app_exit() will be called from app_framework.

Change-Id: I5dff161b758d809d46eb68334cc28efe3ad477ed

diff --git a/src/examples/efl/c/main.cpp b/src/examples/efl/c/main.cpp
index f829b8773b1ea76f6eb2b0f11a97bf9e83401906..ebed278f01bb0ea484e2b86fbdcebbfc9fc01b6b 100644 (file)
--- a/src/examples/efl/c/main.cpp
+++ b/src/examples/efl/c/main.cpp
@@ -66,13 +66,5 @@ main(int argc, char *argv[])
                return ret;
        }
 
-       //Terminate ui_app. Remove all ui_app resources.
-       ret = ui_application_term();
-       if (ret != UI_VIEWMGR_ERROR_NONE)
-       {
-               dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_term() is failed ret = %d", ret);
-               return ret;
-       }
-
        return 0;
 }

diff --git a/src/lib/efl/UiBaseViewmgr.cpp b/src/lib/efl/UiBaseViewmgr.cpp
index afb46322b762f036f408714454933c9497a7258b..cd0d6ebd0e81036b624b1c3dd5a1597052794ec8 100644 (file)
--- a/src/lib/efl/UiBaseViewmgr.cpp
+++ b/src/lib/efl/UiBaseViewmgr.cpp
@@ -457,7 +457,6 @@ UiBaseViewmgr::~UiBaseViewmgr()
 {
        this->_impl->_term();
        delete(this->_impl);
-       ui_app_exit();
 }
 
 int UiBaseViewmgr::activate()

diff --git a/src/lib/efl/mobile/c/ui_application.cpp b/src/lib/efl/mobile/c/ui_application.cpp
index bb845ac135ddc3a56501020483108985d4c0dd6b..68ccb66a46d7f21d13397c928bf72f2c26565366 100644 (file)
--- a/src/lib/efl/mobile/c/ui_application.cpp
+++ b/src/lib/efl/mobile/c/ui_application.cpp
@@ -161,9 +161,7 @@ EAPI int ui_application_run(int argc, char **argv, ui_application_event_s *event
 
 EAPI int ui_application_term(void)
 {
-       ui_app_capi *app = g_app;
-       if (app) delete (app);
-       g_app = nullptr;
+       ui_app_exit();
 
        return UI_VIEWMGR_ERROR_NONE;
 }

diff --git a/src/lib/interface/UiIfaceApp.cpp b/src/lib/interface/UiIfaceApp.cpp
index 36b6decf5a00b9715d656ab2bc4c47219a71c65a..f3d4f0fc7e0d974b307fa1cc17633540f948a996 100644 (file)
--- a/src/lib/interface/UiIfaceApp.cpp
+++ b/src/lib/interface/UiIfaceApp.cpp
@@ -269,6 +269,7 @@ void UiIfaceApp::onControl(app_control_h app_control)
 
 void UiIfaceApp::onTerminate()
 {
+       delete(this);
 }
 
 UiIfaceApp::UiIfaceApp(UiIfaceViewmgr *viewmgr)

diff --git a/src/lib/interface/UiIfaceViewmgr.cpp b/src/lib/interface/UiIfaceViewmgr.cpp
index d0a86e5842b09e2dbd3637f08e0c56224c9c24cc..d1c711de451d742e353b959023dcacbf4ae2d1cf 100644 (file)
--- a/src/lib/interface/UiIfaceViewmgr.cpp
+++ b/src/lib/interface/UiIfaceViewmgr.cpp
@@ -209,8 +209,6 @@ UiIfaceViewmgrImpl::~UiIfaceViewmgrImpl()
        }
        this->_destroying = EINA_FALSE;
 
-       ui_app_exit();
-
        UiIfaceViewmgrImpl::_inst = nullptr;
 }