Don't reset field model if nothing changes

qgis · Jun 24, 2014 · 7d9b8dd · jef-n · Jun 25, 2014 · NathanW2
1 parent 87826ad
commit 7d9b8dd
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
@@ -84,13 +84,23 @@ void QgsFieldModel::layerDeleted()
 
 void QgsFieldModel::updateModel()
 {
-  beginResetModel();
-  mExpression = QList<QString>();
   if ( mLayer )
-    mFields = mLayer->pendingFields();
+  {
+    if ( mFields.toList() != mLayer->pendingFields().toList() )
+    {
+      beginResetModel();
+      mFields = mLayer->pendingFields();
+      endResetModel();
+    }
+    else
+      emit dataChanged( index(0, 0 ), index( rowCount(), 0 ));
+  }
   else
+  {
+    beginResetModel();
     mFields = QgsFields();
-  endResetModel();
+    beginResetModel();
+  }
 }
 
 void QgsFieldModel::setAllowExpression( bool allowExpression )