From 41d0cd8d2b16f148034279460ad036f5df9007d9 Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Tue, 11 Nov 2025 12:47:03 +0100 Subject: [PATCH] layout/tiling: Fix crash swapping across workspaces --- src/shell/layout/tiling/mod.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shell/layout/tiling/mod.rs b/src/shell/layout/tiling/mod.rs index 271a1d7f..42549dd1 100644 --- a/src/shell/layout/tiling/mod.rs +++ b/src/shell/layout/tiling/mod.rs @@ -5554,10 +5554,9 @@ where .as_ref() .map(|swap_desc| { (swap_desc.node == node_id - || target_tree - .ancestor_ids(&node_id) - .unwrap() - .any(|id| &swap_desc.node == id)) + || target_tree.ancestor_ids(&node_id).ok().is_none_or( + |mut ancestors| ancestors.any(|id| &swap_desc.node == id), + )) && swap_desc.stack_window.is_none() }) .unwrap_or(false)