shell: fail cleanly if XFixesGetCursorImage fails

from Mageia, via Olav Vitters
https://bugzilla.gnome.org/show_bug.cgi?id=653119
This commit is contained in:
Dan Winship 2011-08-03 11:12:32 -04:00
parent c1acf992fa
commit 3dc07d48c5
2 changed files with 4 additions and 0 deletions

View File

@ -393,6 +393,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
return; return;
cursor_image = XFixesGetCursorImage (clutter_x11_get_default_display ()); cursor_image = XFixesGetCursorImage (clutter_x11_get_default_display ());
if (!cursor_image)
return;
recorder->cursor_hot_x = cursor_image->xhot; recorder->cursor_hot_x = cursor_image->xhot;
recorder->cursor_hot_y = cursor_image->yhot; recorder->cursor_hot_y = cursor_image->yhot;

View File

@ -202,6 +202,8 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor)
return; return;
cursor_image = XFixesGetCursorImage (clutter_x11_get_default_display ()); cursor_image = XFixesGetCursorImage (clutter_x11_get_default_display ());
if (!cursor_image)
return;
/* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit /* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit
* quantities as arrays of long; we need to convert on 64 bit */ * quantities as arrays of long; we need to convert on 64 bit */