From f22d0ecd97644e7b6526128c3449f0e080188b26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philipp=20Br=C3=BCschweiler?= Date: Mon, 13 Aug 2012 20:04:54 +0200 Subject: [PATCH] dnd: fix segfault on grabbing Some cursor themes don't include a "grabbing" icon, causing a segfault. This patch fixes this by just reverting to the stardard cursor instead. https://bugs.freedesktop.org/show_bug.cgi?id=50487 --- clients/dnd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/clients/dnd.c b/clients/dnd.c index 6f55e95..44c1541 100644 --- a/clients/dnd.c +++ b/clients/dnd.c @@ -20,6 +20,7 @@ * OF THIS SOFTWARE. */ +#include #include #include #include @@ -327,6 +328,12 @@ create_drag_cursor(struct dnd_drag *dnd_drag, cairo_t *cr; pointer = display_get_pointer_image(dnd->display, CURSOR_DRAGGING); + if (!pointer) { + fprintf(stderr, "WARNING: grabbing cursor image not found\n"); + pointer = display_get_pointer_image(dnd->display, + CURSOR_LEFT_PTR); + assert(pointer && "no cursor image found"); + } rectangle.width = item_width + 2 * pointer->width; rectangle.height = item_height + 2 * pointer->height; -- 2.7.4