Don't show a 'invalid layer source' warning if a user opens a multi-layer

nyalldawson · rldhont · commit ea0ed29c29b0 · 2019-06-01T15:42:19.000+02:00
vector file, but then chooses not to actually add any layers from the file
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4608,6 +4608,7 @@ bool QgisApp::addVectorLayersPrivate( const QStringList &layerQStringList, const
   QList<QgsMapLayer *> layersToAdd;
   QList<QgsMapLayer *> addedLayers;
   QgsSettings settings;
+  bool userAskedToAddLayers = false;
 
   for ( QString src : layerQStringList )
   {
@@ -4679,6 +4680,7 @@ bool QgisApp::addVectorLayersPrivate( const QStringList &layerQStringList, const
 
     if ( layer->isValid() )
     {
+      userAskedToAddLayers = true;
       layer->setProviderEncoding( enc );
 
       QStringList sublayers = layer->dataProvider()->subLayers();
@@ -4734,7 +4736,9 @@ bool QgisApp::addVectorLayersPrivate( const QStringList &layerQStringList, const
   // make sure at least one layer was successfully added
   if ( layersToAdd.isEmpty() )
   {
-    return !addedLayers.isEmpty();
+    // we also return true if we asked the user for sublayers, but they choose none. In this case nothing
+    // went wrong, so we shouldn't return false and cause GUI warnings to appear
+    return userAskedToAddLayers || !addedLayers.isEmpty();
   }
 
   // Register this layer with the layers registry

Original file line number	Diff line number	Diff line change
`@@ -4608,6 +4608,7 @@ bool QgisApp::addVectorLayersPrivate( const QStringList &layerQStringList, const`
`4608`	`4608`	`QList<QgsMapLayer *> layersToAdd;`
`4609`	`4609`	`QList<QgsMapLayer *> addedLayers;`
`4610`	`4610`	`QgsSettings settings;`
	`4611`	`+ bool userAskedToAddLayers = false;`
`4611`	`4612`
`4612`	`4613`	`for ( QString src : layerQStringList )`
`4613`	`4614`	`{`
`@@ -4679,6 +4680,7 @@ bool QgisApp::addVectorLayersPrivate( const QStringList &layerQStringList, const`
`4679`	`4680`
`4680`	`4681`	`if ( layer->isValid() )`
`4681`	`4682`	`{`
	`4683`	`+ userAskedToAddLayers = true;`
`4682`	`4684`	`layer->setProviderEncoding( enc );`
`4683`	`4685`
`4684`	`4686`	`QStringList sublayers = layer->dataProvider()->subLayers();`
`@@ -4734,7 +4736,9 @@ bool QgisApp::addVectorLayersPrivate( const QStringList &layerQStringList, const`
`4734`	`4736`	`// make sure at least one layer was successfully added`
`4735`	`4737`	`if ( layersToAdd.isEmpty() )`
`4736`	`4738`	`{`
`4737`		`- return !addedLayers.isEmpty();`
	`4739`	`+ // we also return true if we asked the user for sublayers, but they choose none. In this case nothing`
	`4740`	`+ // went wrong, so we shouldn't return false and cause GUI warnings to appear`
	`4741`	`+ return userAskedToAddLayers \|\| !addedLayers.isEmpty();`
`4738`	`4742`	`}`
`4739`	`4743`
`4740`	`4744`	`// Register this layer with the layers registry`