From 2201a5b0dd739f273f2a906eda3d4d31335c7c71 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Thu, 31 Jan 2019 11:31:22 -0600 Subject: Make gameShortName comparisons case insensitive --- src/modinfo.cpp | 16 ++++++++++++---- src/modlist.cpp | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/modinfo.cpp b/src/modinfo.cpp index 7ae41b02..905341b0 100644 --- a/src/modinfo.cpp +++ b/src/modinfo.cpp @@ -144,14 +144,22 @@ std::vector ModInfo::getByModID(QString game, int modID) { QMutexLocker locker(&s_Mutex); - auto iter = s_ModsByModID.find(std::pair(game, modID)); - if (iter == s_ModsByModID.end()) { + std::vector match; + for (auto iter : s_ModsByModID) { + if (iter.first.second == modID) { + if (iter.first.first.compare(game, Qt::CaseInsensitive) == 0) { + match = iter.second; + break; + } + } + } + if (match.empty()) { return std::vector(); } std::vector result; - for (auto idxIter = iter->second.begin(); idxIter != iter->second.end(); ++idxIter) { - result.push_back(getByIndex(*idxIter)); + for (auto iter : match) { + result.push_back(getByIndex(iter)); } return result; diff --git a/src/modlist.cpp b/src/modlist.cpp index 62c186a4..daa6ce73 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -253,7 +253,7 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const } else if (column == COL_GAME) { if (m_PluginContainer != nullptr) { for (auto game : m_PluginContainer->plugins()) { - if (game->gameShortName() == modInfo->getGameName()) + if (game->gameShortName().compare(modInfo->getGameName(), Qt::CaseInsensitive) == 0) return game->gameName(); } } -- cgit v1.3.1