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

foreign-toplevel: disconnect internal signals from handle_handle_destroy()

Browse source 
If the handle gets destroyed from the wlroots side before the view
is destroyed, the internal signals (emitted from the view) are not
disconnected and will assert() if invoked.
This commit is contained in:
John Lindgren 2025-08-07 15:27:12 -04:00
parent d87ef7568a
commit 55b495f398
2 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/foreign-toplevel/ext-foreign.c
View file

@ -15,6 +15,14 @@ handle_handle_destroy(struct wl_listener *listener, void *data)
/* Client side requests */
wl_list_remove(&ext_toplevel->on.handle_destroy.link);
/* Compositor side state changes */
wl_list_remove(&ext_toplevel->on_view.new_app_id.link);
wl_list_remove(&ext_toplevel->on_view.new_title.link);
/* Internal signals */
wl_list_remove(&ext_toplevel->on_foreign_toplevel.toplevel_destroy.link);
ext_toplevel->handle = NULL;
}
@ -60,14 +68,8 @@ handle_toplevel_destroy(struct wl_listener *listener, void *data)
return;
}
/* invokes handle_handle_destroy() which does more cleanup */
wlr_ext_foreign_toplevel_handle_v1_destroy(ext_toplevel->handle);
/* Compositor side state changes */
wl_list_remove(&ext_toplevel->on_view.new_app_id.link);
wl_list_remove(&ext_toplevel->on_view.new_title.link);
/* Internal signals */
wl_list_remove(&ext_toplevel->on_foreign_toplevel.toplevel_destroy.link);
}
/* Internal API */