[PATCH 2/3] Use encoded file name on import

Miika Turkia miika.turkia at gmail.com
Wed May 4 23:26:11 PDT 2016


Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 desktop-widgets/mainwindow.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index efe91bf..6542a3e 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1736,11 +1736,12 @@ void MainWindow::importTxtFiles(const QStringList fileNames)
 		csv.replace(strlen(csv.data()) - 3, 3, "csv");
 
 		QFileInfo check_file(csv);
-		if (check_file.exists() && check_file.isFile())
+		if (check_file.exists() && check_file.isFile()) {
 			if (parse_txt_file(fileNamePtr.data(), csv) == 0)
 				csvFiles += fileNames.at(i);
-		else
-			csvFiles += fileNames.at(i);
+		} else {
+			csvFiles += fileNamePtr;
+		}
 	}
 	if (csvFiles.size()) {
 		DiveLogImportDialog *diveLogImport = new DiveLogImportDialog(csvFiles, this);
-- 
2.5.0



More information about the subsurface mailing list