Fix crash when showing scratchpad hidden split containers

3 files changed, 13 insertions, 1 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index d745aab5..56c3d981 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -365,7 +365,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
         }
 
         if (argc == 0 && container) {
-                if (container_is_scratchpad_hidden(container)) {
+                if (container_is_scratchpad_hidden_or_child(container)) {
                         root_scratchpad_show(container);
                 }
                 seat_set_focus_container(seat, container);
diff --git a/sway/tree/container.c b/sway/tree/container.c
index aa819be7..56cdee1d 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1527,3 +1527,10 @@ void container_raise_floating(struct sway_container *con) {
 bool container_is_scratchpad_hidden(struct sway_container *con) {
         return con->scratchpad && !con->workspace;
 }
+
+bool container_is_scratchpad_hidden_or_child(struct sway_container *con) {
+        while (con->parent) {
+                con = con->parent;
+        }
+        return con->scratchpad && !con->workspace;
+}
diff --git a/sway/tree/root.c b/sway/tree/root.c
index 46a140ef..ebd185ec 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -132,6 +132,11 @@ void root_scratchpad_show(struct sway_container *con) {
         if (old_ws) {
                 container_detach(con);
                 workspace_consider_destroy(old_ws);
+        } else {
+                // Act on the ancestor of scratchpad hidden split containers
+                while (con->parent) {
+                        con = con->parent;
+                }
         }
         workspace_add_floating(new_ws, con);