Set FilterMode of FilterModel before reloading the data, because othe…

…rwise the old connections are still active.
qgis · May 1, 2020 · ef379f3 · ef379f3
1 parent 759db0a
commit ef379f3
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -298,14 +298,6 @@ void QgsDualView::setFilterMode( QgsAttributeTableFilterModel::FilterMode filter
       break;
   }
 
-  if ( requiresTableReload )
-  {
-    mMasterModel->setRequest( r );
-    whileBlocking( mLayerCache )->setCacheGeometry( needsGeometry );
-    mMasterModel->loadLayer();
-  }
-
-
   // disable the browsing auto pan/scale if the list only shows visible items
   switch ( filterMode )
   {
@@ -323,6 +315,14 @@ void QgsDualView::setFilterMode( QgsAttributeTableFilterModel::FilterMode filter
 
   //update filter model
   mFilterModel->setFilterMode( filterMode );
+
+  if ( requiresTableReload )
+  {
+    mMasterModel->setRequest( r );
+    whileBlocking( mLayerCache )->setCacheGeometry( needsGeometry );
+    mMasterModel->loadLayer();
+  }
+
   emit filterChanged();
 }