addVectorLayers: return early if no layers were succesfully added

fixes an abort later on if all the layer loadings failed for some reason, like missing the shx file for a shapefile.
qgis · Apr 13, 2012 · 15f1485 · 15f1485
1 parent 93f7d9a
commit 15f1485
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2286,12 +2286,16 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS
 
       // since the layer is bad, stomp on it
       delete layer;
-
-      // XXX should we return false here, or just grind through
-      // XXX the remaining arguments?
     }
 
   }
+
+  // make sure at least one layer was succesfully added
+  if ( myList.count() == 0 )
+  {
+    return false;
+  }
+
   // Register this layer with the layers registry
   QgsMapLayerRegistry::instance()->addMapLayers( myList );