[QGIS Commit] r15777 - trunk/qgis/python/plugins/fTools/tools

[svn_qgis at osgeo.org]

Author: alexbruy
Date: 2011-04-20 06:23:12 -0700 (Wed, 20 Apr 2011)
New Revision: 15777

Modified:
   trunk/qgis/python/plugins/fTools/tools/doMergeShapes.py
Log:
fix progressbar behaviour in Merge shapefiles tool


Modified: trunk/qgis/python/plugins/fTools/tools/doMergeShapes.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doMergeShapes.py	2011-04-20 12:43:45 UTC (rev 15776)
+++ trunk/qgis/python/plugins/fTools/tools/doMergeShapes.py	2011-04-20 13:23:12 UTC (rev 15777)
@@ -165,6 +165,7 @@
       self.mergeThread = None
 
   def restoreGui( self ):
+    self.progressFeatures.setRange( 0, 100 )
     self.progressFeatures.setValue( 0 )
     self.progressFiles.setValue( 0 )
     QApplication.restoreOverrideCursor()