Avoid losing layer subset filters after fixing a layer path in the

bad layers dialog Filters are not automatically restored after fixing the path
qgis · Aug 4, 2020 · 826b703 · 826b703
1 parent 27164f2
commit 826b703
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp
@@ -425,8 +425,21 @@ void QgsHandleBadLayers::apply()
       QgsMapLayer *mapLayer = QgsProject::instance()->mapLayer( layerId );
       if ( mapLayer )
       {
+        QString subsetString;
+        QgsVectorLayer *vlayer = qobject_cast< QgsVectorLayer *>( mapLayer );
+        if ( vlayer )
+        {
+          // store the previous layer subset string, so we can restore after fixing the data source
+          subsetString = vlayer->subsetString();
+        }
+
         mapLayer->setDataSource( datasource, name, provider, options );
         dataSourceChanged = mapLayer->isValid();
+
+        if ( dataSourceChanged && vlayer && !subsetString.isEmpty() )
+        {
+          vlayer->setSubsetString( subsetString );
+        }
       }
     }