Don't crash if qApp->overrideCursor() is 0
authorLars Knoll <lars.knoll@nokia.com>
Mon, 26 Sep 2011 20:59:22 +0000 (22:59 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 28 Sep 2011 01:17:10 +0000 (03:17 +0200)
Change-Id: I9e61be7ed537a988ce8ccca20f672f5c66275452
Reviewed-on: http://codereview.qt-project.org/5561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/gui/kernel/qdnd.cpp

index b3aa206..de255b9 100644 (file)
@@ -365,10 +365,9 @@ void QDragManager::updateCursor()
             cursorShape = Qt::DragMoveCursor;
         }
     }
-    if (cursorShape != qApp->overrideCursor()->shape()) {
-        qDebug() << "setting cursor shape to" << cursorShape;
+    QCursor *cursor = qApp->overrideCursor();
+    if (cursor && cursorShape != cursor->shape())
         qApp->changeOverrideCursor(QCursor(cursorShape));
-    }
 }