aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands
diff options
context:
space:
mode:
authorLibravatar Ronan Pigott <rpigott@berkeley.edu>2020-01-14 17:08:01 -0700
committerLibravatar Drew DeVault <sir@cmpwn.com>2020-01-22 13:30:52 -0500
commitc52b1cf45ab1be0e6fcc323eb4889c7bd767ba3f (patch)
tree6408bce58a4de66fa7c85b325c33bd7e5ece6730 /sway/commands
parentdesktop/output: fix mem leak in handle_new_output (diff)
downloadsway-c52b1cf45ab1be0e6fcc323eb4889c7bd767ba3f.tar.gz
sway-c52b1cf45ab1be0e6fcc323eb4889c7bd767ba3f.tar.zst
sway-c52b1cf45ab1be0e6fcc323eb4889c7bd767ba3f.zip
Fix crash when showing scratchpad hidden split containers
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/focus.c2
1 files changed, 1 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) {
365 } 365 }
366 366
367 if (argc == 0 && container) { 367 if (argc == 0 && container) {
368 if (container_is_scratchpad_hidden(container)) { 368 if (container_is_scratchpad_hidden_or_child(container)) {
369 root_scratchpad_show(container); 369 root_scratchpad_show(container);
370 } 370 }
371 seat_set_focus_container(seat, container); 371 seat_set_focus_container(seat, container);