diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-22 14:55:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-22 14:55:32 +0200 |
| commit | cdbfc3338bcaef113ef013a8234ad668eea22a3c (patch) | |
| tree | a2fce5ac671a45f34d2a64fffbcada17c82febbe | |
| parent | ef532154c342ebddc6bc85086521790e265803bc (diff) | |
| parent | 6deb7268738699ba9d654db5aba53866184f1fda (diff) | |
| download | sway-cdbfc3338bcaef113ef013a8234ad668eea22a3c.tar.xz | |
Merge pull request #2924 from RyanDwyer/fix-qt-menu-crash
Fix crash when quitting a QT app on the wayland backend using menu
| -rw-r--r-- | include/sway/tree/view.h | 1 | ||||
| -rw-r--r-- | sway/tree/view.c | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index dc1f0b02..a0b4dd46 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -226,7 +226,6 @@ struct sway_view_child { struct wl_listener surface_map; struct wl_listener surface_unmap; struct wl_listener surface_destroy; - struct wl_listener view_unmap; }; struct sway_xdg_popup_v6 { diff --git a/sway/tree/view.c b/sway/tree/view.c index b23afb97..a8486dd7 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -731,13 +731,6 @@ static void view_child_handle_surface_destroy(struct wl_listener *listener, view_child_destroy(child); } -static void view_child_handle_view_unmap(struct wl_listener *listener, - void *data) { - struct sway_view_child *child = - wl_container_of(listener, child, view_unmap); - view_child_destroy(child); -} - static void view_init_subsurfaces(struct sway_view *view, struct wlr_surface *surface) { struct wlr_subsurface *subsurface; @@ -779,9 +772,6 @@ void view_child_init(struct sway_view_child *child, child->surface_map.notify = view_child_handle_surface_map; child->surface_unmap.notify = view_child_handle_surface_unmap; - wl_signal_add(&view->events.unmap, &child->view_unmap); - child->view_unmap.notify = view_child_handle_view_unmap; - struct sway_output *output = child->view->container->workspace->output; wlr_surface_send_enter(child->surface, output->wlr_output); @@ -791,7 +781,6 @@ void view_child_init(struct sway_view_child *child, void view_child_destroy(struct sway_view_child *child) { wl_list_remove(&child->surface_commit.link); wl_list_remove(&child->surface_destroy.link); - wl_list_remove(&child->view_unmap.link); if (child->impl && child->impl->destroy) { child->impl->destroy(child); |