From 4e0452fce3bfc96db6f6f2951794cbb26e75ccd7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 2 Sep 2018 15:37:56 +1000 Subject: Fix scratchpad related crashes * Was crashing when a view was moved to the scratchpad (prev focus had no parent). * Was crashing when a hidden scratchpad view unmaps because it has no workspace. --- sway/tree/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/tree') diff --git a/sway/tree/view.c b/sway/tree/view.c index 1b8d5738..57851b16 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -560,11 +560,11 @@ void view_unmap(struct sway_view *view) { container_begin_destroy(view->container); if (parent) { container_reap_empty(parent); - } else { + } else if (ws) { workspace_consider_destroy(ws); } - if (!ws->node.destroying) { + if (ws && !ws->node.destroying) { arrange_workspace(ws); workspace_detect_urgent(ws); } -- cgit v1.2.3