Merge pull request #3345 from RyanDwyer/fix-scratchpad-crash

Fix crash when scratchpad contains split containers
6 years ago · f50d161574
parent 9bf1b7a029 dd8d2dedf7
commit f50d161574
1 changed files with 1 additions and 1 deletions
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@ -145,7 +145,7 @@ void root_scratchpad_hide(struct sway_container *con) {

 	container_detach(con);
 	arrange_workspace(ws);
-	if (&con->node == focus) {
+	if (&con->node == focus || node_has_ancestor(focus, &con->node)) {
 		seat_set_focus(seat, seat_get_focus_inactive(seat, &ws->node));
 	}
 	list_move_to_end(root->scratchpad, con);