[layout] Fix crash an attribute table item tries to access a destroye…

…d map
qgis · Aug 14, 2019 · 21d01b7 · 21d01b7
1 parent d7426b2
commit 21d01b7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/core/layout/qgslayoutitemattributetable.cpp b/src/core/layout/qgslayoutitemattributetable.cpp
@@ -224,26 +224,35 @@ void QgsLayoutItemAttributeTable::resetColumns()
   }
 }
 
+void QgsLayoutItemAttributeTable::disconnectCurrentMap()
+{
+  if ( !mMap )
+  {
+    return;
+  }
+
+  disconnect( mMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutTable::refreshAttributes );
+  disconnect( mMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutTable::refreshAttributes );
+  disconnect( mMap, &QObject::destroyed, this, &QgsLayoutItemAttributeTable::disconnectCurrentMap );
+  mMap = nullptr;
+}
+
 void QgsLayoutItemAttributeTable::setMap( QgsLayoutItemMap *map )
 {
   if ( map == mMap )
   {
     //no change
     return;
   }
+  disconnectCurrentMap();
 
-  if ( mMap )
-  {
-    //disconnect from previous map
-    disconnect( mMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutTable::refreshAttributes );
-    disconnect( mMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutTable::refreshAttributes );
-  }
   mMap = map;
   if ( mMap )
   {
     //listen out for extent changes in linked map
     connect( mMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutTable::refreshAttributes );
     connect( mMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutTable::refreshAttributes );
+    connect( mMap, &QObject::destroyed, this, &QgsLayoutItemAttributeTable::disconnectCurrentMap );
   }
   refreshAttributes();
   emit changed();

diff --git a/src/core/layout/qgslayoutitemattributetable.h b/src/core/layout/qgslayoutitemattributetable.h
@@ -299,6 +299,10 @@ class CORE_EXPORT QgsLayoutItemAttributeTable: public QgsLayoutTable
     bool writePropertiesToElement( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const override;
     bool readPropertiesFromElement( const QDomElement &itemElem, const QDomDocument &doc, const QgsReadWriteContext &context ) override;
 
+  private slots:
+
+    void disconnectCurrentMap();
+
   private:
 
     //! Attribute source