From 6657479c729cefc8c1938d9399effa28f2fb8ee0 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Tue, 5 Feb 2013 19:11:02 +0000 Subject: [PATCH] wayland: avoid returning NULL when getting a cursor https://bugzilla.gnome.org/show_bug.cgi?id=693257 --- gdk/wayland/gdkcursor-wayland.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c index 4f87164c32..ce6456515c 100644 --- a/gdk/wayland/gdkcursor-wayland.c +++ b/gdk/wayland/gdkcursor-wayland.c @@ -298,8 +298,14 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay *display, if (!cursor) { g_warning (G_STRLOC ": Unable to load %s from the cursor theme", name); - g_object_unref (private); - return NULL; + + /* return the left_ptr cursor as a fallback */ + cursor = wl_cursor_theme_get_cursor (wayland_display->cursor_theme, + "left_ptr"); + + /* if the fallback failed to load, return a blank pointer */ + if (!cursor) + return GDK_CURSOR (private); } /* TODO: Do something clever so we can do animated cursors - move the