From 9ef9452cf6b5034d0be3c978b6fc3fbb399bb6d8 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 3 Apr 2015 16:39:45 -0700 Subject: [PATCH] make filename extension checking less wrong --- libraries/shared/src/PathUtils.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 545183e8f5..bf846c0bf2 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -29,10 +29,9 @@ QString& PathUtils::resourcesPath() { QString fileNameWithoutExtension(const QString& fileName, const QVector possibleExtensions) { + QString fileNameLowered = fileName.toLower(); foreach (const QString possibleExtension, possibleExtensions) { - if (fileName.endsWith(possibleExtension) || - fileName.endsWith(possibleExtension.toUpper()) || - fileName.endsWith(possibleExtension.toLower())) { + if (fileNameLowered.endsWith(possibleExtension.toLower())) { return fileName.left(fileName.count() - possibleExtension.count() - 1); } }