Skip to content

Commit 1e193c3

Browse files
committed
Merge pull request #121 from lynxlynxlynx/master
fix for one abort and a few SIP compile warnings
2 parents 0358ddc + 15f1485 commit 1e193c3

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

python/analysis/analysis.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%Module qgis.analysis 0
1+
%Module(name=qgis.analysis, version=0)
22

33
%Import QtCore/QtCoremod.sip
44
%Import QtGui/QtGuimod.sip

python/core/core.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%Module qgis.core 0
1+
%Module(name=qgis.core, version=0)
22

33
%Import QtCore/QtCoremod.sip
44
%Import QtGui/QtGuimod.sip

src/app/qgisapp.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,12 +2290,16 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS
22902290

22912291
// since the layer is bad, stomp on it
22922292
delete layer;
2293-
2294-
// XXX should we return false here, or just grind through
2295-
// XXX the remaining arguments?
22962293
}
22972294

22982295
}
2296+
2297+
// make sure at least one layer was succesfully added
2298+
if ( myList.count() == 0 )
2299+
{
2300+
return false;
2301+
}
2302+
22992303
// Register this layer with the layers registry
23002304
QgsMapLayerRegistry::instance()->addMapLayers( myList );
23012305

0 commit comments

Comments
 (0)