Skip to content

Commit af7bf4e

Browse files
committed
Merge branch 'stemfile' into 'master'
Don't use path helpers in the settings window See merge request OpenMW/openmw!5043
2 parents 7ca6fbb + 2c22f74 commit af7bf4e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

apps/openmw/mwgui/settingswindow.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <components/lua_ui/scriptsettings.hpp>
2222
#include <components/misc/constants.hpp>
2323
#include <components/misc/display.hpp>
24-
#include <components/misc/pathhelpers.hpp>
2524
#include <components/misc/strings/algorithm.hpp>
2625
#include <components/resource/resourcesystem.hpp>
2726
#include <components/resource/scenemanager.hpp>
@@ -414,14 +413,14 @@ namespace MWGui
414413
constexpr VFS::Path::NormalizedView l10n("l10n/");
415414
for (const auto& path : vfs->getRecursiveDirectoryIterator(l10n))
416415
{
417-
if (Misc::getFileExtension(path) == "yaml")
416+
if (path.extension() == "yaml")
418417
{
419-
std::string localeName(Misc::stemFile(path));
418+
std::string_view localeName(path.stem());
420419
if (localeName == "gmst")
421420
continue; // fake locale to get gmst strings from content files
422421
if (std::find(availableLanguages.begin(), availableLanguages.end(), localeName)
423422
== availableLanguages.end())
424-
availableLanguages.push_back(std::move(localeName));
423+
availableLanguages.emplace_back(localeName);
425424
}
426425
}
427426

0 commit comments

Comments
 (0)