From 926d6189bf4f954b80b2a019d8bde5f85d4d2b4c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 26 Sep 2011 22:59:22 +0200 Subject: [PATCH] Don't crash if qApp->overrideCursor() is 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9e61be7ed537a988ce8ccca20f672f5c66275452 Reviewed-on: http://codereview.qt-project.org/5561 Reviewed-by: Qt Sanity Bot Reviewed-by: Samuel Rødal --- src/gui/kernel/qdnd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index b3aa206234..de255b9cc5 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -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)); - } }