From: Woochan Lee <wc0917.lee@samsung.com>
Date: Fri, 2 Jun 2017 05:58:17 +0000 (+0900)
Subject: ui_app_exit() called twice when viewmgr terminated.
X-Git-Tag: submit/tizen/20170616.085651^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F84%2F132284%2F1;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git

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 f829b87..ebed278 100644
--- 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 afb4632..cd0d6eb 100644
--- 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 bb845ac..68ccb66 100644
--- 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 36b6dec..f3d4f0f 100644
--- 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 d0a86e5..d1c711d 100644
--- 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;
 }