X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=014c72eb62016ce3486c42c66826065a8a5bf655;hb=2a352777521301937b0d1d4cdcf0e24a1aa2d84e;hp=602e1f6beca5598bd62b7908cd0722dac6fb0ef5;hpb=be9cbe2c4d0bc0f65cbe08de2bad3eb6e7f248c0;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index 602e1f6..014c72e 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->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);