[BACPORT] fix Merge shapefile to one crash when used layers mode

alexbruy · alexbruy · commit 488dd059516e · 2011-12-17T14:41:24.000+02:00
diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/python/plugins/fTools/tools/doMergeShapes.py
@@ -109,9 +109,9 @@ def accept( self ):
       baseDir = QFileInfo( files[ 0 ] ).absolutePath()
     else:
       baseDir = self.leInputDir.text()
-
-    # look for shapes with specified geometry type
-    self.inputFiles = ftools_utils.getShapesByGeometryType( baseDir, self.inputFiles, self.cmbGeometry.currentIndex() )
+      # look for shapes with specified geometry type
+      self.inputFiles = ftools_utils.getShapesByGeometryType( baseDir, self.inputFiles, self.cmbGeometry.currentIndex() )
+      self.progressFiles.setRange( 0, self.inputFiles.count() )
 
     self.progressFiles.setRange( 0, self.inputFiles.count() )
 
@@ -121,6 +121,9 @@ def accept( self ):
         QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( outFileName ) )
         return
 
+    if self.inEncoding == None:
+      self.inEncoding = "System"
+
     self.btnOk.setEnabled( False )
 
     self.mergeThread = ShapeMergeThread( baseDir, self.inputFiles, self.outFileName, self.encoding )
