From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Fri, 10 Aug 2018 06:30:23 +0000 (+0900)
Subject: Fix a little
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d46bfe5081df144da9d0bfc4ffb382feb2220213;p=apps%2Fagl-service-windowmanager-2017.git

Fix a little

Change-Id: I2d43084b0f96c74134a3b0af5ea8839529439840
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index e785e4b..6731022 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -661,12 +661,12 @@ void WindowManager::onApplicationTerminated(const WMClientCtxt& ctxt)
     // Recovery Phase
     if(priv.main == sid)
     {
-        HMI_DEBUG("wm", "go to launcher");
         if(ctxt.role != "launcher")
         {
-            // goto launcher
+            HMI_DEBUG("wm", "go to launcher");
             auto pSid = this->id_alloc.lookup("launcher");
-            std::string app = g_app_list.getAppID(*pSid, "launcher", &found);
+            if(pSid != nullptr)
+                std::string app = g_app_list.getAppID(*pSid, "launcher", &found);
             if(found)
             {
                 this->api_activate_surface(app.c_str(), "launcher", kNameAreaDefault,
@@ -676,10 +676,11 @@ void WindowManager::onApplicationTerminated(const WMClientCtxt& ctxt)
     }
     else if(priv.main != sid && priv.sub != sid)
     {
-        // re-show top surface
-        this->deactivate(priv.main);
-        this->activate(priv.main);
+        // TODO: re-show top surface. The bellow doesn't work.
+        /* this->deactivate(priv.main);
         this->layout_commit();
+        this->activate(priv.main);
+        this->layout_commit(); */
     }
     else {}
     g_app_list.removeClient(ctxt.name);