diff options
| author | Simon Ser <contact@emersion.fr> | 2025-04-14 09:29:45 +0200 |
|---|---|---|
| committer | Kenny Levinsen <kl@kl.wtf> | 2025-04-14 10:21:18 +0200 |
| commit | 3f0b3f8f9b3b737fd0e6d36e2a2c469b07268ec2 (patch) | |
| tree | 26168316d753327703274004e56589fd87d7b011 | |
| parent | 4943534929dfd3f0ea55e26241544354f8365e60 (diff) | |
Fix crash on shutdown when Xwayland is disabled
| -rw-r--r-- | sway/server.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c index f7155a77..5aa5f4f9 100644 --- a/sway/server.c +++ b/sway/server.c @@ -496,9 +496,11 @@ void server_fini(struct sway_server *server) { // TODO: free sway-specific resources #if WLR_HAS_XWAYLAND - wl_list_remove(&server->xwayland_surface.link); - wl_list_remove(&server->xwayland_ready.link); - wlr_xwayland_destroy(server->xwayland.wlr_xwayland); + if (server->xwayland.wlr_xwayland != NULL) { + wl_list_remove(&server->xwayland_surface.link); + wl_list_remove(&server->xwayland_ready.link); + wlr_xwayland_destroy(server->xwayland.wlr_xwayland); + } #endif wl_display_destroy_clients(server->wl_display); wlr_backend_destroy(server->backend); |