3 files changed, 9 insertions, 5 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 62f9ea87..efed7ddf 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -105,8 +105,8 @@ static struct cmd_handler handlers[] = {
         { "exec", cmd_exec },
         { "exec_always", cmd_exec_always },
         { "focus_follows_mouse", cmd_focus_follows_mouse },
-        { "for_window", cmd_for_window },
         { "font", cmd_font },
+        { "for_window", cmd_for_window },
         { "fullscreen", cmd_fullscreen },
         { "include", cmd_include },
         { "input", cmd_input },
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index d1f9e019..29637953 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -219,15 +219,17 @@ struct cmd_results *cmd_resize(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "resize",
                                 "Can only resize views/containers");
         }
+
+        struct cmd_results *error;
+        if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
+                return error;
+        }
+
         if (strcasecmp(argv[0], "set") == 0) {
                 // TODO
                 //return cmd_resize_set(argc - 1, &argv[1]);
                 return cmd_results_new(CMD_INVALID, "resize", "resize set unimplemented");
         }
-        struct cmd_results *error;
-        if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
-                return error;
-        }
 
         // TODO: resize grow|shrink left|right|up|down
 
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index e094bbbe..c0c6e827 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -264,6 +264,8 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
         if (seat_is_input_allowed(cursor->seat, surface)) {
                 wlr_seat_touch_notify_down(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);
         }
 }