mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'use_is_directory_member' into 'master'

Browse source 
Use is_directory member function

See merge request OpenMW/openmw!3897
This commit is contained in:
Alexei Kotov 2024-02-23 12:36:40 +00:00
commit 89d856d03e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/vfs/filesystemarchive.cpp
View file

@ -24,11 +24,11 @@ namespace VFS
for (auto it = std::filesystem::begin(iterator), end = std::filesystem::end(iterator); it != end;)
{
const auto& i = *it;
const std::filesystem::directory_entry& entry = *it;
if (!std::filesystem::is_directory(i))
if (!entry.is_directory())
{
const std::filesystem::path& filePath = i.path();
const std::filesystem::path& filePath = entry.path();
const std::string proper = Files::pathToUnicodeString(filePath);
VFS::Path::Normalized searchable(std::string_view{ proper }.substr(prefix));
FileSystemArchiveFile file(filePath);
@ -43,7 +43,7 @@ namespace VFS
// Exception thrown by the operator++ may not contain the context of the error like what exact path caused
// the problem which makes it hard to understand what's going on when iteration happens over a directory
// with thousands of files and subdirectories.
const std::filesystem::path prevPath = i.path();
const std::filesystem::path prevPath = entry.path();
std::error_code ec;
it.increment(ec);
if (ec != std::error_code())