Fix a crash on exit

nyalldawson · nyalldawson · commit c0f4d0f43a84 · 2017-12-12T19:34:57.000+11:00
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

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,12 @@ QgsLayoutViewToolSelect::QgsLayoutViewToolSelect( QgsLayoutView *view )`
`33`	`33`	`QgsLayoutViewToolSelect::~QgsLayoutViewToolSelect()`
`34`	`34`	`{`
`35`	`35`	`if ( mMouseHandles )`
	`36`	`+ {`
	`37`	`+ // want to force them to be removed from the scene`
	`38`	`+ if ( mMouseHandles->scene() )`
	`39`	`+ mMouseHandles->scene()->removeItem( mMouseHandles );`
`36`	`40`	`mMouseHandles->deleteLater();`
	`41`	`+ }`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )`