Fix invalid access 00/213500/1
authorHwankyu Jhun <h.jhun@samsung.com>
Fri, 6 Sep 2019 04:08:23 +0000 (13:08 +0900)
committerHwankyu Jhun <h.jhun@samsung.com>
Fri, 6 Sep 2019 04:08:23 +0000 (13:08 +0900)
Change-Id: If0425f189e23b0d6cc904fba0c1475ddccb9db81
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
component_based/base/application_base.cc

index 6b90a98a96b8e0eba3ad0a3f5eace5826a940757..576cdc7c0b8fe4c93d013fabdb53f01b76aa29d3 100644 (file)
@@ -92,6 +92,8 @@ bool ApplicationBase::Impl::OnBaseCreate() {
 
 void ApplicationBase::Impl::OnBaseTerminate() {
   LOGD("");
+  auto& mgr = internal::ComponentManager::GetInst();
+  mgr.ExitAll();
   parent_->OnTerminate();
 }
 
@@ -223,8 +225,6 @@ int ApplicationBase::Impl::Run(int argc, char** argv) {
 }
 
 void ApplicationBase::Impl::Exit() {
-  auto& mgr = internal::ComponentManager::GetInst();
-  mgr.ExitAll();
   core_base_->Exit();
 }