[Fix #7698] Attributetable crashes on close when valuemap is used

qgis · May 13, 2013 · 142223b · 142223b
1 parent 110b87e
commit 142223b
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -58,13 +58,7 @@ QgsAttributeTableModel::QgsAttributeTableModel( QgsVectorLayerCache *layerCache,
 
 QgsAttributeTableModel::~QgsAttributeTableModel()
 {
-  const QMap<QString, QVariant> *item;
-  foreach ( item, mValueMaps )
-  {
-    delete item;
-  }
-
-  mValueMaps.clear();
+  qDeleteAll( mValueMaps );
 }
 
 bool QgsAttributeTableModel::loadFeatureAtId( QgsFeatureId fid ) const
@@ -201,7 +195,7 @@ void QgsAttributeTableModel::loadAttributes()
         continue;
 
       case QgsVectorLayer::ValueMap:
-        mValueMaps.insert( idx, &layer()->valueMap( idx ) );
+        mValueMaps.insert( idx, new QMap< QString, QVariant >( layer()->valueMap( idx ) ) );
         break;
 
       case QgsVectorLayer::ValueRelation: