focus: Don't stack overflow because None=None

2024-06-06 13:07:24 +02:00 · 2024-06-06 13:07:24 +02:00 · b5dcec5215
commit b5dcec5215
parent 697ec9e1fe
1 changed files with 8 additions and 1 deletions
--- a/src/shell/focus/mod.rs
+++ b/src/shell/focus/mod.rs
@ -232,7 +232,14 @@ fn raise_with_children(floating_layer: &mut FloatingLayout, focused: &CosmicMapp
                    .0
                    .toplevel()
                    .and_then(|toplevel| toplevel.parent());
-                parent == focused.active_window().wl_surface().map(Cow::into_owned)
+                parent.is_some_and(|parent| {
+                    focused
+                        .active_window()
+                        .wl_surface()
+                        .map(Cow::into_owned)
+                        .map(|focused| parent == focused)
+                        .unwrap_or(false)
+                })
            })
            .cloned()
            .collect::<Vec<_>>()