From 199ee20adb7005f5485f8535ebd2169750e9110b Mon Sep 17 00:00:00 2001 From: TheDaemoness Date: Sat, 30 May 2020 10:07:49 -0700 Subject: [PATCH] Fixed an instance of eager cursor loading. Also fixed a minor formatting issue. --- glfw/wl_cursors.c | 2 +- glfw/wl_window.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/glfw/wl_cursors.c b/glfw/wl_cursors.c index 7395a1b3a..2ebb05c5c 100644 --- a/glfw/wl_cursors.c +++ b/glfw/wl_cursors.c @@ -37,7 +37,7 @@ _themeInit(_themeData *dest, const char *name, int px) { dest->theme = wl_cursor_theme_load(name, px, _glfw.wl.shm); if(!dest->theme) { _glfwInputError(GLFW_PLATFORM_ERROR, - "Wayland: Unable to load cursor theme"); + "Wayland: Unable to load cursor theme"); } } else { dest->theme = NULL; diff --git a/glfw/wl_window.c b/glfw/wl_window.c index 2c3df3297..e331a58b5 100644 --- a/glfw/wl_window.c +++ b/glfw/wl_window.c @@ -1474,8 +1474,6 @@ static bool isPointerLocked(_GLFWwindow* window) void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) { - struct wl_cursor* defaultCursor; - if (!_glfw.wl.pointer) return; @@ -1496,15 +1494,8 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) setCursorImage(window, &cursor->wl); else { - defaultCursor = _glfwLoadCursor(GLFW_ARROW_CURSOR, window->wl.cursorTheme); - if (!defaultCursor) return; - _GLFWcursorWayland cursorWayland = { - defaultCursor, - NULL, - 0, 0, - 0, 0, - 0 - }; + _GLFWcursorWayland cursorWayland = {0}; + cursorWayland.shape = GLFW_ARROW_CURSOR; setCursorImage(window, &cursorWayland); } }