aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-05-04 09:27:55 +0100
committeremersion <contact@emersion.fr>2018-05-04 09:27:55 +0100
commit393f7aaeff7485f78de9c27f62eefe70d76fabf4 (patch)
tree6405193240ea281005e3fcf146a6242000bc0b91 /rootston
parent2964248f42568d7fae410072be30cee1981d6f96 (diff)
Fix a rootston crash when a client creates non-topmost popups
Diffstat (limited to 'rootston')
-rw-r--r--rootston/xdg_shell.c2
-rw-r--r--rootston/xdg_shell_v6.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c
index bd670a87..83a1caf0 100644
--- a/rootston/xdg_shell.c
+++ b/rootston/xdg_shell.c
@@ -18,6 +18,8 @@ static void popup_destroy(struct roots_view_child *child) {
}
wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link);
+ wl_list_remove(&popup->map.link);
+ wl_list_remove(&popup->unmap.link);
view_child_finish(&popup->view_child);
free(popup);
}
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 39e8a4b7..5a829f5d 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -18,6 +18,8 @@ static void popup_destroy(struct roots_view_child *child) {
}
wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link);
+ wl_list_remove(&popup->map.link);
+ wl_list_remove(&popup->unmap.link);
view_child_finish(&popup->view_child);
free(popup);
}