Fix invalid read when closing layout designers

Child widget was referring to its parent in the destructor - at this stage the parent may no longer be in a usable state (if the child's destruction was caused by the parent's destruction)
qgis · Jan 22, 2018 · cbe6416 · cbe6416
1 parent 35a7701
commit cbe6416
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/gui/layout/qgslayoutviewtool.cpp b/src/gui/layout/qgslayoutviewtool.cpp
@@ -49,7 +49,8 @@ QList<QgsLayoutItem *> QgsLayoutViewTool::ignoredSnapItems() const
 
 QgsLayoutViewTool::~QgsLayoutViewTool()
 {
-  mView->unsetTool( this );
+  if ( mView )
+    mView->unsetTool( this );
 }
 
 QgsLayoutViewTool::Flags QgsLayoutViewTool::flags() const

diff --git a/src/gui/layout/qgslayoutviewtool.h b/src/gui/layout/qgslayoutviewtool.h
@@ -215,7 +215,7 @@ class GUI_EXPORT QgsLayoutViewTool : public QObject
   private:
 
     //! Pointer to layout view.
-    QgsLayoutView *mView = nullptr;
+    QPointer< QgsLayoutView > mView;
 
     QgsLayoutViewTool::Flags mFlags = nullptr;