From 98741c864cf995c92fb0550d8b4d9aa1585f2494 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Thu, 5 May 2016 09:26:11 +0300
Subject: [PATCH] Use encoded file name on import

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 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 efe91bf23..6542a3ead 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);