1 files changed, 7 insertions, 3 deletions

diff --git a/src/grail-gestures.c b/src/grail-gestures.c
index 035a199..efadde5 100644
--- a/src/grail-gestures.c
+++ b/src/grail-gestures.c
@@ -111,6 +111,7 @@ static void move_reset(struct move_model *m, int i, float x, grail_time_t t)
         fm->sample_ms = t;
         m->tickle &= ~(1 << i);
         m->active &= ~(1 << i);
+        m->timeout &= ~(1 << i);
 }
 
 static void move_update(struct move_model *m, int i, float x, grail_time_t t)
@@ -132,11 +133,14 @@ static void move_update(struct move_model *m, int i, float x, grail_time_t t)
         if (m->active & (1 << i))
                 return;
         fm->action_delta = x - fm->original;
-        if (fabs(fm->action_delta) > fm->bar ||
-            t - fm->original_ms > fm->bar_ms)
+        if (fabs(fm->action_delta) > fm->bar) {
                 m->active |= (1 << i);
-        else
+        } else if (t - fm->original_ms > fm->bar_ms) {
+                m->active |= (1 << i);
+                m->timeout |= (1 << i);
+        } else {
                 fm->action_delta = 0;
+        }
 }
 
 void gru_init_motion(struct grail *ge)