mirror of
https://github.com/OpenMW/openmw.git
synced 2025-04-27 22:06:49 +00:00
Merge branch 'collection-lowercase' into 'master'
Makes key inside Collection::getCollection use lowercase Closes #6483 See merge request OpenMW/openmw!2135
This commit is contained in:
commit
2ef2e93a46
1 changed files with 3 additions and 2 deletions
|
@ -20,11 +20,12 @@ namespace Files
|
||||||
|
|
||||||
const MultiDirCollection& Collections::getCollection(const std::string& extension) const
|
const MultiDirCollection& Collections::getCollection(const std::string& extension) const
|
||||||
{
|
{
|
||||||
MultiDirCollectionContainer::iterator iter = mCollections.find(extension);
|
std::string ext = Misc::StringUtils::lowerCase(extension);
|
||||||
|
auto iter = mCollections.find(ext);
|
||||||
if (iter==mCollections.end())
|
if (iter==mCollections.end())
|
||||||
{
|
{
|
||||||
std::pair<MultiDirCollectionContainer::iterator, bool> result =
|
std::pair<MultiDirCollectionContainer::iterator, bool> result =
|
||||||
mCollections.insert(std::make_pair(extension, MultiDirCollection(mDirectories, extension, mFoldCase)));
|
mCollections.emplace(ext, MultiDirCollection(mDirectories, ext, mFoldCase));
|
||||||
|
|
||||||
iter = result.first;
|
iter = result.first;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue