From 1899d99d1cf7d6c1807912d6156d456436a87763 Mon Sep 17 00:00:00 2001 From: John Van Ostrand Date: Tue, 28 Oct 2014 16:34:33 -0400 Subject: Fixed RegExp bug This prevented import of log files other than CSV and TXT. Signed-off-by: John Van Ostrand Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 9e62a8a6e..1d4b22a8e 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); } -- cgit v1.2.3-70-g09d2