Merge pull request #2761 from RyanDwyer/seat-op-ignore-buttons

Ignore unrelated cursor buttons while doing seat operations

1 files changed, 6 insertions, 5 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 3c62acb9..331c6c7e 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -754,11 +754,12 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
         }
         struct sway_seat *seat = cursor->seat;
 
-        // Handle ending seat operation
-        if (cursor->seat->operation != OP_NONE &&
-                        button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) {
-                seat_end_mouse_operation(seat);
-                seat_pointer_notify_button(seat, time_msec, button, state);
+        // Handle existing seat operation
+        if (cursor->seat->operation != OP_NONE) {
+                if (button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) {
+                        seat_end_mouse_operation(seat);
+                        seat_pointer_notify_button(seat, time_msec, button, state);
+                }
                 return;
         }