Merge pull request #9653 from elpaso/bugfix-badlayers-apply-no-style

Fix bad layers style loss when "apply"
qgis · Mar 30, 2019 · ca80fb6052d8e1108b9ae25b47cf1bbbfa971c55 · ca80fb6
2 parents 41f3ac0 + 94b9d8f
commit ca80fb6052d8e1108b9ae25b47cf1bbbfa971c55
Unified Split

Showing with 15 additions and 4 deletions.

+15 −4 src/app/qgshandlebadlayers.cpp
diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp
@@ -412,11 +412,22 @@ void QgsHandleBadLayers::apply()
     if ( QgsProject::instance()->mapLayer( layerId ) )
     {
       QgsMapLayer *mapLayer = QgsProject::instance()->mapLayer( layerId );
-      if ( mapLayer )
+      QgsDataProvider::ProviderOptions options;
+      const auto absolutePath { QgsProject::instance()->pathResolver().readPath( datasource ) };
+      mapLayer->setDataSource( absolutePath, name, provider, options );
+      dataSourceFixed  = mapLayer->isValid();
+      if ( dataSourceFixed )
       {
-        QgsDataProvider::ProviderOptions options;
-        mapLayer->setDataSource( datasource, name, provider, options );
-        dataSourceFixed  = mapLayer->isValid();
+        QString errorMsg;
+        QgsReadWriteContext context;
+        context.setPathResolver( QgsProject::instance()->pathResolver() );
+        context.setProjectTranslator( QgsProject::instance() );
+        if ( ! mapLayer->readSymbology( node, errorMsg, context ) )
+        {
+          QgsDebugMsg( QStringLiteral( "Failed to restore original layer style from node XML for layer %1: %2" )
+                       .arg( mapLayer->name( ) )
+                       .arg( errorMsg ) );
+        }
       }
     }