[mutter] cursor: Move check for cursor NULL-ness
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cursor: Move check for cursor NULL-ness
- Date: Tue, 18 Aug 2015 21:02:34 +0000 (UTC)
commit a5417ebee1d5b5597253ddc5d39a69bdff9d1800
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Aug 18 13:58:58 2015 -0700
cursor: Move check for cursor NULL-ness
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.
src/backends/meta-cursor.c | 2 +-
src/core/screen.c | 3 ---
2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c
index d888c3e..0be3976 100644
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -313,7 +313,7 @@ load_cursor_image (MetaCursorReference *cursor)
cursor->current_frame = 0;
cursor->xcursor_images = load_cursor_on_client (cursor->cursor);
if (!cursor->xcursor_images)
- return;
+ meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
}
image = meta_cursor_reference_get_current_frame_image (cursor);
diff --git a/src/core/screen.c b/src/core/screen.c
index 5fb4980..4a95de6 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1265,9 +1265,6 @@ meta_screen_update_cursor (MetaScreen *screen)
MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
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_reference_unref (cursor_ref);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]