diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-07-27 08:23:44 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-28 06:15:14 (GMT) |
| commit | 3a2a18d64f96f54522869495eba33935374c1f1e (patch) | |
| tree | 806055c89757428154939bc5551bdb30031721e1 /src/gui/kernel/qwidget.cpp | |
| parent | 1772b199718fd3e113175ffbb5eddfa5fd51656b (diff) | |
| download | Qt-3a2a18d64f96f54522869495eba33935374c1f1e.zip Qt-3a2a18d64f96f54522869495eba33935374c1f1e.tar.gz Qt-3a2a18d64f96f54522869495eba33935374c1f1e.tar.bz2 | |
Check the gesturemanager pointer before accessing it.
This fixes a crash when a static QWidget is destroyed after the QApplication
object.
Task-number: QTBUG-12025
Reviewed-by: Zeno Albisser
(cherry picked from commit 475a3c275ba173cb130a838b6053cb45d405887e)
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 233df15..1b8c091 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -12047,8 +12047,8 @@ void QWidget::ungrabGesture(Qt::GestureType gesture) { Q_D(QWidget); if (d->gestureContext.remove(gesture)) { - QGestureManager *manager = QGestureManager::instance(); - manager->cleanupCachedGestures(this, gesture); + if (QGestureManager *manager = QGestureManager::instance()) + manager->cleanupCachedGestures(this, gesture); } } #endif // QT_NO_GESTURES |