diff options
| author | Sune Vuorela <sune@vuorela.dk> | 2017-07-19 17:59:49 +0200 |
|---|---|---|
| committer | Sune Vuorela <sune@vuorela.dk> | 2017-08-23 20:43:16 +0000 |
| commit | 4c3246e49521b6341ddcc513814ae03e6d8f1d3e (patch) | |
| tree | ac0671f61add168aaefa78ee42212eb4b1c0471a /src/quick/items | |
| parent | 363189a3d351ace484180ede0f2f6c4ed04f8401 (diff) | |
Fix crash in mouseGrabberItem
Under certain circumstances, point can be null.
All users of mouseGrabberItem does check for nullpointers,
so it should be safe.
Task-number: QTBUG-62055
Change-Id: I1d53b7980efa4fe149714a65f35d05fa306efb06
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index c124150b8d..07b3d538e5 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1494,8 +1494,7 @@ QQuickItem *QQuickWindow::mouseGrabberItem() const if (d->touchMouseId != -1 && d->touchMouseDevice) { QQuickPointerEvent *event = d->pointerEventInstance(d->touchMouseDevice); auto point = event->pointById(d->touchMouseId); - Q_ASSERT(point); - return point->grabber(); + return point ? point->grabber() : nullptr; } QQuickPointerEvent *event = d->pointerEventInstance(QQuickPointerDevice::genericMouseDevice()); |