sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Bruy 2011-12-17 14:32:25 +02:00
parent 9f1f070cad
commit a20cec3824
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/plugins/fTools/tools/doMergeShapes.py
View File

@ -116,6 +116,9 @@ class Dialog( QDialog, Ui_Dialog ):
baseDir = QFileInfo( files[ 0 ] ).absolutePath() baseDir = QFileInfo( files[ 0 ] ).absolutePath()
else: else:
baseDir = self.leInputDir.text() baseDir = self.leInputDir.text()
# 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() )
outFile = QFile( self.outFileName ) outFile = QFile( self.outFileName )
if outFile.exists(): if outFile.exists():
@ -123,10 +126,6 @@ class Dialog( QDialog, Ui_Dialog ):
QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( outFileName ) ) QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( outFileName ) )
return return
# 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() )
if self.inEncoding == None: if self.inEncoding == None:
self.inEncoding = "System" self.inEncoding = "System"