From be1266b6d45efdf09ff268a0a5165d4dcf882ff2 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 24 Jun 2014 19:34:41 +0200 Subject: [PATCH] QmlDesigner: fix crash while drag between itemview and editorview Change-Id: I4db56cb308f4412499900e0c787981dbea493138 Reviewed-by: Marco Bubke --- src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 16534e92ced..f2c4ce7de92 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -315,11 +315,11 @@ void DragTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * event) if (event->mimeData()->hasFormat("application/vnd.bauhaus.itemlibraryinfo") || event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) { event->accept(); - if (m_dragNode.isValid()) - m_dragNode.destroy(); m_moveManipulator.end(); clear(); + if (m_dragNode.isValid()) + m_dragNode.destroy(); commitTransaction();