aboutsummaryrefslogtreecommitdiffstats
path: root/qt-ui/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar John Van Ostrand <john@vanostrand.com>2014-10-28 16:34:33 -0400
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-10-28 14:18:29 -0700
commit1899d99d1cf7d6c1807912d6156d456436a87763 (patch)
tree3036829d1708a98ddf46a219eb761c3d544f2bdc /qt-ui/mainwindow.cpp
parent35df344b03bc40df61fcaa5a237e7c86c32d015f (diff)
downloadsubsurface-1899d99d1cf7d6c1807912d6156d456436a87763.tar.gz
Fixed RegExp bug
This prevented import of log files other than CSV and TXT. Signed-off-by: John Van Ostrand <john@vanostrand.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
-rw-r--r--qt-ui/mainwindow.cpp3
1 files changed, 2 insertions, 1 deletions
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);
}