Skip to content
Permalink
Browse files
Merge pull request #121 from lynxlynxlynx/master
fix for one abort and a few SIP compile warnings
  • Loading branch information
wonder-sk committed Apr 13, 2012
2 parents 0358ddc + 15f1485 commit 1e193c32c2930b3a91e1bad90fab83ab4e3a3650
Showing with 9 additions and 5 deletions.
  1. +1 −1 python/analysis/analysis.sip
  2. +1 −1 python/core/core.sip
  3. +7 −3 src/app/qgisapp.cpp
@@ -1,4 +1,4 @@
%Module qgis.analysis 0
%Module(name=qgis.analysis, version=0)

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

%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
@@ -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 );

0 comments on commit 1e193c3

Please sign in to comment.