[PATCH] Fixed RegExp bug

John Van Ostrand john at vanostrand.com
Tue Oct 28 13:34:33 PDT 2014


This prevented import of log files other than CSV and TXT.

Signed-off-by: John Van Ostrand <john at vanostrand.com>
---
 qt-ui/mainwindow.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 9e62a8a..1d4b22a 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -1234,9 +1234,10 @@ void MainWindow::on_actionImportDiveLog_triggered()
 		return;
 	updateLastUsedDir(QFileInfo(fileNames[0]).dir().path());
 
-	QStringList logFiles = fileNames.filter(QRegExp("^.*\\.(?!csv|?!txt)", Qt::CaseInsensitive));
+	QStringList logFiles = fileNames.filter(QRegExp("^.*\\.(?!(csv|txt))", Qt::CaseInsensitive));
 	QStringList csvFiles = fileNames.filter(".csv", Qt::CaseInsensitive);
 	QStringList txtFiles = fileNames.filter(".txt", Qt::CaseInsensitive);
+
 	if (logFiles.size()) {
 		importFiles(logFiles);
 	}
-- 
1.8.3.1



More information about the subsurface mailing list