Merge pull request #32854 from nirvn/loadstylefix

elpaso · web-flow · commit a059c367d956 · 2019-11-14T14:31:09.000+01:00
Followup 64949d : fix failure to load provider-provided style
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -4677,20 +4677,26 @@ QString QgsVectorLayer::loadNamedStyle( const QString &theURI, bool &resultFlag,
 {
   QgsDataSourceUri dsUri( theURI );
   QString returnMessage;
+  QString qml, errorMsg;
   if ( !loadFromLocalDB && mDataProvider && mDataProvider->isSaveAndLoadStyleToDatabaseSupported() )
   {
-    QString qml, errorMsg;
     qml = QgsProviderRegistry::instance()->loadStyle( mProviderKey, mDataSource, errorMsg );
-    if ( !qml.isEmpty() )
-    {
-      QDomDocument myDocument( QStringLiteral( "qgis" ) );
-      myDocument.setContent( qml );
-      resultFlag = importNamedStyle( myDocument, errorMsg );
-      returnMessage = QObject::tr( "Loaded from Provider" );
-    }
   }
-  returnMessage = QgsMapLayer::loadNamedStyle( theURI, resultFlag, categories );
-  emit styleLoaded( categories );
+  if ( !qml.isEmpty() )
+  {
+    QDomDocument myDocument( QStringLiteral( "qgis" ) );
+    myDocument.setContent( qml );
+    resultFlag = importNamedStyle( myDocument, errorMsg );
+    returnMessage = QObject::tr( "Loaded from Provider" );
+  }
+  else
+  {
+    returnMessage = QgsMapLayer::loadNamedStyle( theURI, resultFlag, categories );
+  }
+
+  if ( resultFlag )
+    emit styleLoaded( categories );
+
   return returnMessage;
 }
 
