mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 17:06:40 +00:00
Code Issues Releases Wiki Activity

Use normalized path in ESM4 reader

Browse source
This commit is contained in:
elsid 2024-09-18 23:52:20 +02:00
parent 74d699c502
commit 2ddc77138a
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/esm4/reader.cpp
View file

@ -320,16 +320,18 @@ namespace ESM4
std::filesystem::path path = strings / (prefix + language + suffix); std::filesystem::path path = strings / (prefix + language + suffix);
if (mVFS != nullptr) if (mVFS != nullptr)
{ {
std::string vfsPath = Files::pathToUnicodeString(path); VFS::Path::Normalized vfsPath(Files::pathToUnicodeString(path));
if (!mVFS->exists(vfsPath)) Files::IStreamPtr stream = mVFS->find(vfsPath);
if (stream == nullptr)
{ {
path = strings / (prefix + altLanguage + suffix); path = strings / (prefix + altLanguage + suffix);
vfsPath = Files::pathToUnicodeString(path); vfsPath = VFS::Path::Normalized(Files::pathToUnicodeString(path));
stream = mVFS->find(vfsPath);
} }
if (mVFS->exists(vfsPath)) if (stream != nullptr)
{ {
const Files::IStreamPtr stream = mVFS->get(vfsPath);
buildLStringIndex(stringType, *stream); buildLStringIndex(stringType, *stream);
return; return;
} }