aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-01-22 18:33:26 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-25 18:26:36 +0100
commit55b545b5926fd2ecbb54c0d7bdeba0d79b4cf656 (patch)
treeb933c6044073541b32f78862ff26de8b3ca98902 /src
parentafb5bf71c942d411d6102ce637bc7499d8ae467c (diff)
Flickable: fix crash in delayed press handling
Task-number: QTBUG-31328 Change-Id: Ic87e9b4db09242b49f104a8f38e4e420c62db75c Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquickflickable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 333c11cb29..ec199a5a9b 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1234,7 +1234,7 @@ void QQuickFlickable::mouseReleaseEvent(QMouseEvent *event)
d->replayDelayedPress();
// Now send the release
- if (window()->mouseGrabberItem()) {
+ if (window() && window()->mouseGrabberItem()) {
QPointF localPos = window()->mouseGrabberItem()->mapFromScene(event->windowPos());
QScopedPointer<QMouseEvent> mouseEvent(QQuickWindowPrivate::cloneMouseEvent(event, &localPos));
window()->sendEvent(window()->mouseGrabberItem(), mouseEvent.data());