mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2924 from RyanDwyer/fix-qt-menu-crash

Browse source 
Fix crash when quitting a QT app on the wayland backend using menu
This commit is contained in:
Drew DeVault 2018-10-22 14:55:32 +02:00 • committed by GitHub
commit cdbfc3338b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/sway/tree/view.h
View file

@ -226,7 +226,6 @@ struct sway_view_child {
struct wl_listener surface_map; struct wl_listener surface_map;
struct wl_listener surface_unmap; struct wl_listener surface_unmap;
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
struct wl_listener view_unmap;
}; };
struct sway_xdg_popup_v6 { struct sway_xdg_popup_v6 {

11
sway/tree/view.c
View file

@ -731,13 +731,6 @@ static void view_child_handle_surface_destroy(struct wl_listener *listener,
view_child_destroy(child); 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, static void view_init_subsurfaces(struct sway_view *view,
struct wlr_surface *surface) { struct wlr_surface *surface) {
struct wlr_subsurface *subsurface; 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_map.notify = view_child_handle_surface_map;
child->surface_unmap.notify = view_child_handle_surface_unmap; 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; struct sway_output *output = child->view->container->workspace->output;
wlr_surface_send_enter(child->surface, output->wlr_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) { void view_child_destroy(struct sway_view_child *child) {
wl_list_remove(&child->surface_commit.link); wl_list_remove(&child->surface_commit.link);
wl_list_remove(&child->surface_destroy.link); wl_list_remove(&child->surface_destroy.link);
wl_list_remove(&child->view_unmap.link);
if (child->impl && child->impl->destroy) { if (child->impl && child->impl->destroy) {
child->impl->destroy(child); child->impl->destroy(child);