vector layer ctor: avoid 'Data source is invalid' warning when invoked with defaults

jef-n · jef-n · commit 09e1c8c71a16 · 2017-03-03T00:08:14.000+01:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -159,7 +159,7 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath,
   connect( mJoinBuffer, &QgsVectorLayerJoinBuffer::joinedFieldsChanged, this, &QgsVectorLayer::onJoinedFieldsChanged );
 
   // if we're given a provider type, try to create and bind one to this layer
-  if ( ! mProviderKey.isEmpty() )
+  if ( !vectorLayerPath.isEmpty() && !mProviderKey.isEmpty() )
   {
     setDataSource( vectorLayerPath, baseName, providerKey, loadDefaultStyleFlag );
   }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath,`
`159`	`159`	`connect( mJoinBuffer, &QgsVectorLayerJoinBuffer::joinedFieldsChanged, this, &QgsVectorLayer::onJoinedFieldsChanged );`
`160`	`160`
`161`	`161`	`// if we're given a provider type, try to create and bind one to this layer`
`162`		`- if ( ! mProviderKey.isEmpty() )`
	`162`	`+ if ( !vectorLayerPath.isEmpty() && !mProviderKey.isEmpty() )`
`163`	`163`	`{`
`164`	`164`	`setDataSource( vectorLayerPath, baseName, providerKey, loadDefaultStyleFlag );`
`165`	`165`	`}`