X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=apps%2Fagl-service-windowmanager-2017.git;a=blobdiff_plain;f=src%2Fmain.cpp;fp=src%2Fmain.cpp;h=6521c6cb69d57f0795fca6f0bf90cb8785619a61;hp=e982337f0e0b690d652743dc3cca05a856090e54;hb=c6f9a9b8468b3746a3dec7ee2a0b7d84ec9fb44a;hpb=e4222ca8da3b02afca5625fa2cef6832aa8ce90e

diff --git a/src/main.cpp b/src/main.cpp
index e982337..6521c6c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -195,6 +195,18 @@ static void cbRemoveClientCtxt(void *data)
     if (pSid)
     {
         auto sid = *pSid;
+        auto o_state = *g_afb_instance->wmgr.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->wmgr.id_alloc.remove_id(sid);
         g_afb_instance->wmgr.layers.remove_surface(sid);
         g_afb_instance->wmgr.controller->sprops.erase(sid);