Skip to content

Commit 3f0b3f8

Browse files
emersionkennylevinsen
authored andcommitted
Fix crash on shutdown when Xwayland is disabled
1 parent 4943534 commit 3f0b3f8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

sway/server.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,11 @@ void server_fini(struct sway_server *server) {
496496

497497
// TODO: free sway-specific resources
498498
#if WLR_HAS_XWAYLAND
499-
wl_list_remove(&server->xwayland_surface.link);
500-
wl_list_remove(&server->xwayland_ready.link);
501-
wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
499+
if (server->xwayland.wlr_xwayland != NULL) {
500+
wl_list_remove(&server->xwayland_surface.link);
501+
wl_list_remove(&server->xwayland_ready.link);
502+
wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
503+
}
502504
#endif
503505
wl_display_destroy_clients(server->wl_display);
504506
wlr_backend_destroy(server->backend);

0 commit comments

Comments
 (0)