Merge pull request #950 from emersion/fix-xdg-popup-not-topmost-segfault

Fix a rootston crash when a client creates non-topmost popups
This commit is contained in:
Drew DeVault 2018-05-04 07:28:10 -04:00 committed by GitHub
commit bf793a68c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View File

@ -18,6 +18,8 @@ static void popup_destroy(struct roots_view_child *child) {
} }
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.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); view_child_finish(&popup->view_child);
free(popup); free(popup);
} }

View File

@ -18,6 +18,8 @@ static void popup_destroy(struct roots_view_child *child) {
} }
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.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); view_child_finish(&popup->view_child);
free(popup); free(popup);
} }