From e7026e0a7e7f0cd03a5409495b814b094381c121 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Wed, 26 Jul 2023 16:13:24 +0200
Subject: [PATCH] tiling: Cleanup group indicators on drop

---
 src/shell/layout/tiling/mod.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/shell/layout/tiling/mod.rs b/src/shell/layout/tiling/mod.rs
index cf478745..124de62e 100644
--- a/src/shell/layout/tiling/mod.rs
+++ b/src/shell/layout/tiling/mod.rs
@@ -1785,13 +1785,12 @@ impl TilingLayout {
                 .collect::<Vec<_>>()
                 .into_iter()
             {
-                let matches = matches!(
-                    tree.get(&id).map(|node| node.data()),
-                    Ok(Data::Placeholder { .. })
-                );
-
-                if matches {
-                    TilingLayout::unmap_internal(&mut tree, &id);
+                match tree.get_mut(&id).map(|node| node.data_mut()) {
+                    Ok(Data::Placeholder { .. }) => TilingLayout::unmap_internal(&mut tree, &id),
+                    Ok(Data::Group { pill_indicator, .. }) if pill_indicator.is_some() => {
+                        pill_indicator.take();
+                    }
+                    _ => {}
                 }
             }
         }