Fix check condition for layer style restore

elpaso · elpaso · commit 70d9b6ca439f · 2018-11-05T10:24:35.000+01:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6955,7 +6955,7 @@ void QgisApp::changeDataSource( QgsMapLayer *layer )
       bool layerIsValid( layer->isValid() );
       layer->setDataSource( uri.uri, layer->name(), uri.providerKey, QgsDataProvider::ProviderOptions() );
       // Re-apply style
-      if ( !( layerIsValid && layer->originalXmlProperties().isEmpty() ) )
+      if ( !( layerIsValid || layer->originalXmlProperties().isEmpty() ) )
       {
         QgsReadWriteContext context;
         context.setPathResolver( QgsProject::instance()->pathResolver() );

Original file line number	Diff line number	Diff line change
`@@ -6955,7 +6955,7 @@ void QgisApp::changeDataSource( QgsMapLayer *layer )`
`6955`	`6955`	`bool layerIsValid( layer->isValid() );`
`6956`	`6956`	`layer->setDataSource( uri.uri, layer->name(), uri.providerKey, QgsDataProvider::ProviderOptions() );`
`6957`	`6957`	`// Re-apply style`
`6958`		`- if ( !( layerIsValid && layer->originalXmlProperties().isEmpty() ) )`
	`6958`	`+ if ( !( layerIsValid \|\| layer->originalXmlProperties().isEmpty() ) )`
`6959`	`6959`	`{`
`6960`	`6960`	`QgsReadWriteContext context;`
`6961`	`6961`	`context.setPathResolver( QgsProject::instance()->pathResolver() );`