1 files changed, 6 insertions, 5 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index eab102fd..afad6f6f 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -30,7 +30,7 @@
 // when dragging to the edge of a layout container.
 #define DROP_LAYOUT_BORDER 30
 
-static uint32_t get_current_time_msec() {
+static uint32_t get_current_time_msec(void) {
         struct timespec now;
         clock_gettime(CLOCK_MONOTONIC, &now);
         return now.tv_nsec / 1000;
@@ -1007,8 +1007,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
         if (seat_is_input_allowed(seat, surface)) {
                 wlr_seat_touch_notify_down(wlr_seat, surface, event->time_msec,
                                 event->touch_id, sx, sy);
-                cursor->image_client = NULL;
-                wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
+                cursor_set_image(cursor, NULL, NULL);
         }
 }
 
@@ -1176,11 +1175,13 @@ static void handle_request_set_cursor(struct wl_listener *listener,
 
 void cursor_set_image(struct sway_cursor *cursor, const char *image,
                 struct wl_client *client) {
-        if (!cursor->image || strcmp(cursor->image, image) != 0) {
+        if (!image) {
+                wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
+        } else if (!cursor->image || strcmp(cursor->image, image) != 0) {
                 wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
                                 cursor->cursor);
-                cursor->image = image;
         }
+        cursor->image = image;
         cursor->image_client = client;
 }