Merge pull request #121 from lynxlynxlynx/master

fix for one abort and a few SIP compile warnings
qgis · Apr 13, 2012 · 1e193c3 · 1e193c3
2 parents 0358ddc + 15f1485
commit 1e193c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip
@@ -1,4 +1,4 @@
-%Module qgis.analysis 0
+%Module(name=qgis.analysis, version=0)
 
 %Import QtCore/QtCoremod.sip
 %Import QtGui/QtGuimod.sip

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -1,4 +1,4 @@
-%Module qgis.core 0
+%Module(name=qgis.core, version=0)
 
 %Import QtCore/QtCoremod.sip
 %Import QtGui/QtGuimod.sip

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2290,12 +2290,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 );