diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-05-04 07:28:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 07:28:10 -0400 |
| commit | bf793a68c1e62a7634c22681b33c33fa557df916 (patch) | |
| tree | 7ef90ee2220baaf388268a9ebfdbe70e9f917355 /rootston | |
| parent | d0a939243b61e596fce1a654585244209d06f042 (diff) | |
| parent | 393f7aaeff7485f78de9c27f62eefe70d76fabf4 (diff) | |
Merge pull request #950 from emersion/fix-xdg-popup-not-topmost-segfault
Fix a rootston crash when a client creates non-topmost popups
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/xdg_shell.c | 2 | ||||
| -rw-r--r-- | rootston/xdg_shell_v6.c | 2 |
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); } |