Skip to content

Commit a20cec3

Browse files
committed
[BACPORT] fix Merge shapefile to one crash when used layers mode
1 parent 9f1f070 commit a20cec3

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

python/plugins/fTools/tools/doMergeShapes.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,16 @@ def accept( self ):
116116
baseDir = QFileInfo( files[ 0 ] ).absolutePath()
117117
else:
118118
baseDir = self.leInputDir.text()
119+
# look for shapes with specified geometry type
120+
self.inputFiles = ftools_utils.getShapesByGeometryType( baseDir, self.inputFiles, self.cmbGeometry.currentIndex() )
121+
self.progressFiles.setRange( 0, self.inputFiles.count() )
119122

120123
outFile = QFile( self.outFileName )
121124
if outFile.exists():
122125
if not QgsVectorFileWriter.deleteShapeFile( self.outFileName ):
123126
QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( outFileName ) )
124127
return
125128

126-
# look for shapes with specified geometry type
127-
self.inputFiles = ftools_utils.getShapesByGeometryType( baseDir, self.inputFiles, self.cmbGeometry.currentIndex() )
128-
self.progressFiles.setRange( 0, self.inputFiles.count() )
129-
130129
if self.inEncoding == None:
131130
self.inEncoding = "System"
132131

0 commit comments

Comments
 (0)