fixed #5522 and #5529

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@162 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · May 2, 2012 · cfaa9ad · cfaa9ad
1 parent 98c2bb0
commit cfaa9ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/sextante/ftools/Intersection.py b/src/sextante/ftools/Intersection.py
@@ -47,7 +47,7 @@ def processAlgorithm(self, progress):
         else:
             if not crsA != crsB:
                 SextanteLog.addToLog(SextanteLog.LOG_WARNING, "Intersection. Non-matching CRSs. Results might be unexpected")
-        fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
+        fields = ftools_utils.combineVectorFields(vlayerA, vlayerB)
         longNames = ftools_utils.checkFieldNameLength( fields )
         if not longNames.isEmpty():
             raise GeoAlgorithmExecutionException("Following field names are longer than 10 characters:\n" +  longNames.join('\n') )

diff --git a/src/sextante/parameters/ParameterNumber.py b/src/sextante/parameters/ParameterNumber.py
@@ -18,7 +18,7 @@ def __init__(self, name="", description="", minValue = None, maxValue = None, de
         self.value = None
 
     def setValue(self, n):
-        if value is None:
+        if n is None:
             self.value = self.default
             return True
         try:

diff --git a/src/sextante/parameters/ParameterSelection.py b/src/sextante/parameters/ParameterSelection.py
@@ -9,7 +9,7 @@ def __init__(self, name="", description="", options=[], default = 0):
         self.default = default
 
     def setValue(self, n):
-        if value is None:
+        if n is None:
             self.value = self.default
             return True
         try: