brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cursor: Move check for cursor NULL-ness

Browse Source 
Before, it used to be in the screen, but now,
meta_cursor_reference_from_theme can never fail. Move it to where we
load the images from the cursor name.
This commit is contained in:
Jasper St. Pierre 2015-08-18 13:58:58 -07:00
parent b64b159109
commit a5417ebee1
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-cursor.c
View File

@ -313,7 +313,7 @@ load_cursor_image (MetaCursorReference *cursor)
cursor->current_frame = 0; cursor->current_frame = 0;
cursor->xcursor_images = load_cursor_on_client (cursor->cursor); cursor->xcursor_images = load_cursor_on_client (cursor->cursor);
if (!cursor->xcursor_images) if (!cursor->xcursor_images)
return; meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
} }
image = meta_cursor_reference_get_current_frame_image (cursor); image = meta_cursor_reference_get_current_frame_image (cursor);

3
src/core/screen.c
View File

@ -1265,9 +1265,6 @@ meta_screen_update_cursor (MetaScreen *screen)
MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen); MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
cursor_ref = meta_cursor_reference_from_theme (cursor); cursor_ref = meta_cursor_reference_from_theme (cursor);
if (cursor_ref == NULL)
meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
meta_cursor_tracker_set_root_cursor (tracker, cursor_ref); meta_cursor_tracker_set_root_cursor (tracker, cursor_ref);
meta_cursor_reference_unref (cursor_ref); meta_cursor_reference_unref (cursor_ref);