aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend/drm/legacy.c5
-rw-r--r--xwayland/xwayland.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c
index d27cf137..c205e167 100644
--- a/backend/drm/legacy.c
+++ b/backend/drm/legacy.c
@@ -39,7 +39,10 @@ bool legacy_crtc_set_cursor(struct wlr_drm_backend *drm,
}
if (!bo) {
- drmModeSetCursor(drm->fd, crtc->id, 0, 0, 0);
+ if (drmModeSetCursor(drm->fd, crtc->id, 0, 0, 0)) {
+ wlr_log_errno(WLR_DEBUG, "Failed to clear hardware cursor");
+ return false;
+ }
return true;
}
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 4755608f..fe09ea5e 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -406,6 +406,10 @@ static bool xwayland_start_server_lazy(struct wlr_xwayland *wlr_xwayland) {
}
void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland) {
+ if (!wlr_xwayland) {
+ return;
+ }
+
wlr_xwayland_set_seat(wlr_xwayland, NULL);
xwayland_finish_server(wlr_xwayland);
xwayland_finish_display(wlr_xwayland);