From e599814feb5bc62c4a419d332bcca39bbea15190 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Tue, 12 May 2009 16:38:08 +0200
Subject: Small improvement in gesturemanager and a fix for potential crash

---
 src/gui/kernel/qgesturemanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 1dda34c..2750df4 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -519,7 +519,7 @@ bool QGestureManager::sendGestureEvent(QWidget *receiver, const QSet<QGesture*>
         it != e; ++it) {
         QGesture *g = *it;
         QGesturePrivate *gd = g->d_func();
-        if (!gd->widget && (g->state() == Qt::GestureStarted || g->state() == Qt::GestureFinished)) {
+        if (!gd->widget && (g->state() == Qt::GestureStarted || gd->singleshot)) {
             startedGestures.insert(g);
             // find the target widget
             QWidget *w = receiver;
@@ -575,7 +575,7 @@ bool QGestureManager::sendGestureEvent(QWidget *receiver, const QSet<QGesture*>
                 QWidget *w = gd->widget;
                 gd->widget = 0;
 
-                if (!w->isWindow()) {
+                if (w && !w->isWindow()) {
                     g->translate(w->pos());
                     w = w->parentWidget();
                     QPoint offset;
-- 
cgit v0.12