fix progressbar behaviour in Merge shapefiles tool

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15777 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: alexbruy

python/plugins/fTools/tools/doMergeShapes.py

@@ -165,6 +165,7 @@ def stopProcessing( self ):
       self.mergeThread = None
 
   def restoreGui( self ):
+    self.progressFeatures.setRange( 0, 100 )
     self.progressFeatures.setValue( 0 )
     self.progressFiles.setValue( 0 )
     QApplication.restoreOverrideCursor()