From 8a4f2f998a0fbfd6c0fe44b8f8578be8245d3946 Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sun, 24 Apr 2016 21:11:18 +0300 Subject: [PATCH] Fix file extension regesp The original negative lookahead failed in case the file name contains more than 1 dot as it looks for dot that is not followed by the given extensions. And such a match exists in the file name. The new version should look properly if the file ends with any of the given extensions. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- desktop-widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 0859ecb52..c6624df5a 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -1814,7 +1814,7 @@ void MainWindow::on_actionImportDiveLog_triggered() return; updateLastUsedDir(QFileInfo(fileNames[0]).dir().path()); - QStringList logFiles = fileNames.filter(QRegExp("^.*\\.(?!(csv|txt|apd|zxu|zxl))", Qt::CaseInsensitive)); + QStringList logFiles = fileNames.filter(QRegExp("^(?!.*\\.(csv|txt|apd|zxu|zxl))", Qt::CaseInsensitive)); QStringList csvFiles = fileNames.filter(".csv", Qt::CaseInsensitive); csvFiles += fileNames.filter(".apd", Qt::CaseInsensitive); csvFiles += fileNames.filter(".zxu", Qt::CaseInsensitive);