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 /sway/tree | |
parent | Merge pull request #2923 from RyanDwyer/fix-move-to-fullscreen-crash (diff) | |
parent | Fix crash when quitting a QT app on the wayland backend using menu (diff) | |
download | sway-cdbfc3338bcaef113ef013a8234ad668eea22a3c.tar.gz sway-cdbfc3338bcaef113ef013a8234ad668eea22a3c.tar.zst sway-cdbfc3338bcaef113ef013a8234ad668eea22a3c.zip |
Merge pull request #2924 from RyanDwyer/fix-qt-menu-crash
Fix crash when quitting a QT app on the wayland backend using menu
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/view.c | 11 |
1 files changed, 0 insertions, 11 deletions
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, | |||
731 | view_child_destroy(child); | 731 | view_child_destroy(child); |
732 | } | 732 | } |
733 | 733 | ||
734 | static void view_child_handle_view_unmap(struct wl_listener *listener, | ||
735 | void *data) { | ||
736 | struct sway_view_child *child = | ||
737 | wl_container_of(listener, child, view_unmap); | ||
738 | view_child_destroy(child); | ||
739 | } | ||
740 | |||
741 | static void view_init_subsurfaces(struct sway_view *view, | 734 | static void view_init_subsurfaces(struct sway_view *view, |
742 | struct wlr_surface *surface) { | 735 | struct wlr_surface *surface) { |
743 | struct wlr_subsurface *subsurface; | 736 | struct wlr_subsurface *subsurface; |
@@ -779,9 +772,6 @@ void view_child_init(struct sway_view_child *child, | |||
779 | child->surface_map.notify = view_child_handle_surface_map; | 772 | child->surface_map.notify = view_child_handle_surface_map; |
780 | child->surface_unmap.notify = view_child_handle_surface_unmap; | 773 | child->surface_unmap.notify = view_child_handle_surface_unmap; |
781 | 774 | ||
782 | wl_signal_add(&view->events.unmap, &child->view_unmap); | ||
783 | child->view_unmap.notify = view_child_handle_view_unmap; | ||
784 | |||
785 | struct sway_output *output = child->view->container->workspace->output; | 775 | struct sway_output *output = child->view->container->workspace->output; |
786 | wlr_surface_send_enter(child->surface, output->wlr_output); | 776 | wlr_surface_send_enter(child->surface, output->wlr_output); |
787 | 777 | ||
@@ -791,7 +781,6 @@ void view_child_init(struct sway_view_child *child, | |||
791 | void view_child_destroy(struct sway_view_child *child) { | 781 | void view_child_destroy(struct sway_view_child *child) { |
792 | wl_list_remove(&child->surface_commit.link); | 782 | wl_list_remove(&child->surface_commit.link); |
793 | wl_list_remove(&child->surface_destroy.link); | 783 | wl_list_remove(&child->surface_destroy.link); |
794 | wl_list_remove(&child->view_unmap.link); | ||
795 | 784 | ||
796 | if (child->impl && child->impl->destroy) { | 785 | if (child->impl && child->impl->destroy) { |
797 | child->impl->destroy(child); | 786 | child->impl->destroy(child); |