From b3ee1c1f9b67d6b3002aa1caeb07026398bead4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Thu, 19 Apr 2018 12:03:24 +0200 Subject: [PATCH] #2755 Fix import dialog path filter matching --- ApplicationCode/Commands/RicFileHierarchyDialog.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/Commands/RicFileHierarchyDialog.cpp b/ApplicationCode/Commands/RicFileHierarchyDialog.cpp index 98977a879b..653fdb4fb3 100644 --- a/ApplicationCode/Commands/RicFileHierarchyDialog.cpp +++ b/ApplicationCode/Commands/RicFileHierarchyDialog.cpp @@ -419,7 +419,9 @@ QStringList RicFileHierarchyDialog::createNameFilterList(const QString &fileName //-------------------------------------------------------------------------------------------------- bool RicFileHierarchyDialog::pathFilterMatch(const QString& pathFilter, const QString& relPath) { - QRegExp regexp(pathFilter, Qt::CaseInsensitive, QRegExp::Wildcard); + QString pattern = pathFilter; + if (relPath.endsWith(SEPARATOR) && !pathFilter.endsWith(SEPARATOR)) pattern += SEPARATOR; + QRegExp regexp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard); return regexp.exactMatch(relPath); }