Fix a crash on exit

qgis · Dec 12, 2017 · c0f4d0f · c0f4d0f
1 parent 6f47c6a
commit c0f4d0f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/gui/layout/qgslayoutviewtoolselect.cpp b/src/gui/layout/qgslayoutviewtoolselect.cpp
@@ -33,7 +33,12 @@ QgsLayoutViewToolSelect::QgsLayoutViewToolSelect( QgsLayoutView *view )
 QgsLayoutViewToolSelect::~QgsLayoutViewToolSelect()
 {
   if ( mMouseHandles )
+  {
+    // want to force them to be removed from the scene
+    if ( mMouseHandles->scene() )
+      mMouseHandles->scene()->removeItem( mMouseHandles );
     mMouseHandles->deleteLater();
+  }
 }
 
 void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )

diff --git a/src/gui/layout/qgslayoutviewtoolselect.h b/src/gui/layout/qgslayoutviewtoolselect.h
@@ -73,7 +73,7 @@ class GUI_EXPORT QgsLayoutViewToolSelect : public QgsLayoutViewTool
     //! Start of rubber band creation
     QPointF mRubberBandStartPos;
 
-    QgsLayoutMouseHandles *mMouseHandles = nullptr; //owned by scene
+    QPointer< QgsLayoutMouseHandles > mMouseHandles; //owned by scene
 };
 
 #endif // QGSLAYOUTVIEWTOOLSELECT_H