Fix a rootston crash when a client creates non-topmost popups

7 years ago · 393f7aaeff
parent 2964248f42
commit 393f7aaeff
2 changed files with 4 additions and 0 deletions
--- 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);
 }
--- 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);
 }