Merge pull request #463 from emersion/fix-hw-cursor-move-segfault

Fix segfault when moving hardware cursor
This commit is contained in:
Scott Anderson 2017-12-06 17:32:32 +13:00 committed by GitHub
commit dad19394cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -634,8 +634,10 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
struct wlr_box transformed_box; struct wlr_box transformed_box;
wlr_output_transform_apply_to_box(transform, &box, &transformed_box); wlr_output_transform_apply_to_box(transform, &box, &transformed_box);
transformed_box.x -= plane->cursor_hotspot_x; if (plane != NULL) {
transformed_box.y -= plane->cursor_hotspot_y; transformed_box.x -= plane->cursor_hotspot_x;
transformed_box.y -= plane->cursor_hotspot_y;
}
return drm->iface->crtc_move_cursor(drm, conn->crtc, transformed_box.x, return drm->iface->crtc_move_cursor(drm, conn->crtc, transformed_box.x,
transformed_box.y); transformed_box.y);