Merge pull request #1558 from emersion/fix-hide-cursor-mgpu

backend/drm: fix NULL dereference when unsetting cursor
6 years ago · 93c8b91b05
parent fd0b625ab9 2a738803b2
commit 93c8b91b05
1 changed files with 2 additions and 3 deletions
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@ -720,9 +720,8 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
 	}

 	struct gbm_bo *bo = plane->cursor_enabled ? plane->surf.back : NULL;
-
-	if (drm->parent) {
-		bo = copy_drm_surface_mgpu(&plane->mgpu_surf, plane->surf.back);
+	if (bo && drm->parent) {
+		bo = copy_drm_surface_mgpu(&plane->mgpu_surf, bo);
 	}

 	if (bo) {