From d5a353563462d3eebd5e138a0ed4f850ea8cd809 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Thu, 30 Aug 2018 14:30:16 +0900 Subject: Fix Window Manager crush when application terminated Fix Window Manager crush when applicaiton terminated caused by wrong handling of sd_event_source. v2. Add error check just in case conflict : window_manager.cpp Fix build error Bug-AGL: SPEC-1696 Change-Id: I639a60015cde46fca6bc5a3f6e8037afd8d79330 Signed-off-by: Kazumasa Mitsunari --- src/window_manager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/window_manager.cpp b/src/window_manager.cpp index dec7752..41fc5c8 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -867,8 +867,12 @@ void WindowManager::startTransitionWrapper(vector &actions) if ("" != act.role) { bool found; - auto const &surface_id = this->id_alloc.lookup(act.role); - string appid = g_app_list.getAppID(*surface_id, &found); + auto const &surface_id = this->id_alloc.lookup(act.role.c_str()); + if(surface_id == nullopt) + { + goto proc_remove_request; + } + std::string appid = g_app_list.getAppID(*surface_id, &found); if (!found) { if (TaskVisible::INVISIBLE == act.visible) -- cgit 1.2.3-korg