summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2011-03-30 17:25:20 +0200
committerHenrik Rydberg <rydberg@euromail.se>2011-03-30 17:25:20 +0200
commitc9f0f2b856bf8f4b464da7d0938300b11edc2a93 (patch)
tree4f0be6dfe3f93805040a4d71935ce002877afa6e
parent601ded516fbd45ebf12429f4cde67bf7629f6f91 (diff)
Do not discard a started gesture
Not all discarding code paths were taking the notion of a started gesture into account. Specifically, switching to a gesture of higher proiority would leave the old gesture without a finish. Fixed with this patch. Note that timeout implies not sent, so all discarding code paths are now covered. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--src/grail-inserter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index 651d08d..f784848 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -151,7 +151,7 @@ void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
151 151
152 grail_mask_foreach(i, gin->used, sizeof(gin->used)) { 152 grail_mask_foreach(i, gin->used, sizeof(gin->used)) {
153 struct slot_state *s = &gin->state[i]; 153 struct slot_state *s = &gin->state[i];
154 if (!s->nclient || s->priority < discard[s->slice]) 154 if (!s->nclient || s->priority < discard[s->slice] && !s->sent)
155 gin_gid_discard(ge, s->id); 155 gin_gid_discard(ge, s->id);
156 } 156 }
157 157