Skip to content

Commit 6b3aed0

Browse files
committed
Better fix for QgsVectorFileWriter segfault and test
- Revert test to 735c255 commit, excepting 'assert myResult==QgsVectorFileWriter.NoError' edit
1 parent 89eb054 commit 6b3aed0

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/core/qgsvectorfilewriter.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,10 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
647647
QgsVectorFileWriter* writer =
648648
new QgsVectorFileWriter( fileName, fileEncoding, skipAttributeCreation ? QgsFieldMap() : layer->pendingFields(), layer->wkbType(), outputCRS, driverName, datasourceOptions, layerOptions, newFilename );
649649

650-
QgsDebugMsg( "newFilename = " + *newFilename );
650+
if ( newFilename )
651+
{
652+
QgsDebugMsg( "newFilename = " + *newFilename );
653+
}
651654

652655
// check whether file creation was successful
653656
WriterError err = writer->hasError();

tests/src/python/test_qgsvectorfilewriter.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def testWrite(self):
6767
myLayerOptions = QStringList()
6868
mySelectedOnlyFlag = False
6969
mySkipAttributesFlag = False
70-
myNewFileName = QString()
7170
myGeoCrs = QgsCoordinateReferenceSystem()
7271
myGeoCrs.createFromId(4326, QgsCoordinateReferenceSystem.EpsgCrsId)
7372
myResult = QgsVectorFileWriter.writeAsVectorFormat(
@@ -80,8 +79,7 @@ def testWrite(self):
8079
myErrorMessage,
8180
myOptions,
8281
myLayerOptions,
83-
mySkipAttributesFlag,
84-
myNewFileName)
82+
mySkipAttributesFlag)
8583
assert myResult==QgsVectorFileWriter.NoError
8684

8785
if __name__ == '__main__':

0 commit comments

Comments
 (0)