Merge branch 'fix_master_file' into 'master'

Fix checking whether content file is master file See merge request OpenMW/openmw!1980
3 years ago · ef978f080b
parent c7449dc272 f8eafe0dfd
commit ef978f080b
1 changed files with 2 additions and 1 deletions
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@ -34,7 +34,8 @@ void EsmLoader::load(const boost::filesystem::path& filepath, int& index, Loadin

    mStore.load(*reader, listener, mDialogue);

-    if (!mMasterFileFormat.has_value() && Misc::StringUtils::ciEndsWith(reader->getName(), ".esm") && !Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame"))
+    if (!mMasterFileFormat.has_value() && (Misc::StringUtils::ciEndsWith(reader->getName(), ".esm")
+                                           || Misc::StringUtils::ciEndsWith(reader->getName(), ".omwgame")))
        mMasterFileFormat = reader->getFormat();
 }