sway

commit f50d1615748d6169da773ed8bd4679eac87f0f99
parent 9bf1b7a029afe2fdb07cb2bfe35cca4ad76098f9
Author: Brian Ashworth <RedSoxFan@users.noreply.github.com>
Date:   Fri, 28 Dec 2018 23:57:34 -0500

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

Fix crash when scratchpad contains split containers
Diffstat:
M
sway/tree/root.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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);