X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=935063428c739b8b6b1a0336fa71c04d5668727b;hb=5562332f0f7e916d4da13eab5e2b01ccdfb184ac;hp=25fbf2aeed239b5bb64c3544378c5dd6598ea3e1;hpb=bbf684fb596414141190958dbd0b0abcc0f7f6d3;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index 25fbf2a..9350634 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -197,6 +197,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);