Fix: Potentially missing separator in CSV exports

svetter · svetter · commit c9b605179db1 · 2023-12-24T23:40:56.000+01:00
diff --git a/src/tools/export_writer.cpp b/src/tools/export_writer.cpp
@@ -205,6 +205,7 @@ void CsvExportWriter::beginRow()
 void CsvExportWriter::writeCell(const QVariant& value, const ExportColumnInfo& columnInfo)
 {
 	if (afterFirstItemInRow) *fileWriter << separator;
+	afterFirstItemInRow = true;
 	
 	if (!value.isValid() || value.isNull()) return;
 	
@@ -288,8 +289,6 @@ void CsvExportWriter::writeCell(const QVariant& value, const ExportColumnInfo& c
 	if (formattedValueContainsSeparator) *fileWriter << "\"";
 	*fileWriter << formattedValue.replace("\"", "\\\"");
 	if (formattedValueContainsSeparator) *fileWriter << "\"";
-	
-	afterFirstItemInRow = true;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ void CsvExportWriter::beginRow()`
`205`	`205`	`void CsvExportWriter::writeCell(const QVariant& value, const ExportColumnInfo& columnInfo)`
`206`	`206`	`{`
`207`	`207`	`if (afterFirstItemInRow) *fileWriter << separator;`
	`208`	`+ afterFirstItemInRow = true;`
`208`	`209`
`209`	`210`	`if (!value.isValid() \|\| value.isNull()) return;`
`210`	`211`
`@@ -288,8 +289,6 @@ void CsvExportWriter::writeCell(const QVariant& value, const ExportColumnInfo& c`
`288`	`289`	`if (formattedValueContainsSeparator) *fileWriter << "\"";`
`289`	`290`	`*fileWriter << formattedValue.replace("\"", "\\\"");`
`290`	`291`	`if (formattedValueContainsSeparator) *fileWriter << "\"";`
`291`		`-`
`292`		`- afterFirstItemInRow = true;`
`293`	`292`	`}`
`294`	`293`
`295`	`294`	`/**`