Bug Fix: Window Manager doesn't react after killing app process

[apps/agl-service-windowmanager.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index f7c6dd0..014c72e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,11 +18,9 @@
 #include <algorithm>
 #include <mutex>
 #include <json.h>
-#include <json.hpp>
+#include "../include/json.hpp"
 #include "app.hpp"
-#include "result.hpp"
 #include "json_helper.hpp"
-#include "util.hpp"
 #include "wayland_ivi_wm.hpp"
 
 extern "C"
@@ -197,6 +195,18 @@ static void cbRemoveClientCtxt(void *data)
     if (pSid)
     {
         auto sid = *pSid;
+        auto o_state = *g_afb_instance->app.layers.get_layout_state(sid);
+        if (o_state != nullptr)
+        {
+            if (o_state->main == sid)
+            {
+                o_state->main = -1;
+            }
+            else if (o_state->sub == sid)
+            {
+                o_state->sub = -1;
+            }
+        }
         g_afb_instance->app.id_alloc.remove_id(sid);
         g_afb_instance->app.layers.remove_surface(sid);
         g_afb_instance->app.controller->sprops.erase(sid);