Skip to content

Commit 6efb3b5

Browse files
committed
cage: remove global server listeners on shutdown
1 parent e21c155 commit 6efb3b5

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

cage.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,11 +596,25 @@ main(int argc, char *argv[])
596596
wl_display_run(server.wl_display);
597597

598598
#if CAGE_HAS_XWAYLAND
599+
if (xwayland) {
600+
wl_list_remove(&server.new_xwayland_surface.link);
601+
}
599602
wlr_xwayland_destroy(xwayland);
600603
wlr_xcursor_manager_destroy(xcursor_manager);
601604
#endif
602605
wl_display_destroy_clients(server.wl_display);
603606

607+
wl_list_remove(&server.new_virtual_pointer.link);
608+
wl_list_remove(&server.new_virtual_keyboard.link);
609+
wl_list_remove(&server.output_manager_apply.link);
610+
wl_list_remove(&server.output_manager_test.link);
611+
wl_list_remove(&server.xdg_toplevel_decoration.link);
612+
wl_list_remove(&server.new_xdg_toplevel.link);
613+
wl_list_remove(&server.new_xdg_popup.link);
614+
wl_list_remove(&server.new_idle_inhibitor_v1.link);
615+
wl_list_remove(&server.new_output.link);
616+
wl_list_remove(&server.output_layout_change.link);
617+
604618
end:
605619
if (pid != 0)
606620
app_ret = cleanup_primary_client(pid);

0 commit comments

Comments
 (0)