diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2013-02-05 19:11:02 +0000 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2013-02-06 16:56:44 +0000 |
| commit | 6657479c729cefc8c1938d9399effa28f2fb8ee0 (patch) | |
| tree | 058b0fd5021ceaa7e40d95aebf567eecb2ba470a | |
| parent | 4f6d535626c441dbe063ee63344556f4ec68c81e (diff) | |
| download | gtk+-6657479c729cefc8c1938d9399effa28f2fb8ee0.tar.gz | |
wayland: avoid returning NULL when getting a cursor
https://bugzilla.gnome.org/show_bug.cgi?id=693257
| -rw-r--r-- | gdk/wayland/gdkcursor-wayland.c | 10 |
1 files 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 |