From aef3f345fbba38debec85f690cc17ba31c6d42f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Str=C3=B6bl?= Date: Thu, 3 Jan 2013 09:18:09 +0100 Subject: [PATCH] fix #6925 fTools' eliminate now works if the polygon to merge with has an id of 0 --- python/plugins/fTools/tools/doEliminate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/plugins/fTools/tools/doEliminate.py b/python/plugins/fTools/tools/doEliminate.py index 6e806c24f48..7330dc7a789 100644 --- a/python/plugins/fTools/tools/doEliminate.py +++ b/python/plugins/fTools/tools/doEliminate.py @@ -167,7 +167,7 @@ class Dialog(QtGui.QDialog, Ui_Dialog): try: found = fidsToEliminate.index(selFid) except ValueError: #selFid is not in fidsToEliminate - # check wether the geometry to eliminate and the other geometry intersect + # check whether the geometry to eliminate and the other geometry intersect selFeat = QgsFeature() if outLayer.featureAtId(selFid, selFeat, True, False): @@ -190,7 +190,7 @@ class Dialog(QtGui.QDialog, Ui_Dialog): mergeWithFid = selFid mergeWithGeom = QgsGeometry(selGeom) # deep copy of the geometry - if mergeWithFid: # a successful candidate + if mergeWithFid != None: # a successful candidate try: geomList = geomsToMerge[mergeWithFid] except KeyError: