diff options
author | Lioncash <mathew1800@gmail.com> | 2021-09-22 23:52:37 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2021-09-22 23:59:00 +0200 |
commit | 40314cc58646e9e91e961e0d82b7d1b53bd839a0 (patch) | |
tree | 17ec58af41507fc0edff29325b528ac4029d599b /src/core/hle/service/acc | |
parent | Merge pull request #7003 from ameerj/unlocked-present-mode (diff) | |
download | yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.tar yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.tar.gz yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.tar.bz2 yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.tar.lz yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.tar.xz yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.tar.zst yuzu-40314cc58646e9e91e961e0d82b7d1b53bd839a0.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/acc/acc.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/service/acc/profile_manager.cpp | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 6d9ec0a8a..689b36056 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -929,8 +929,7 @@ void Module::Interface::TrySelectUserWithoutInteraction(Kernel::HLERequestContex } const auto user_list = profile_manager->GetAllUsers(); - if (std::all_of(user_list.begin(), user_list.end(), - [](const auto& user) { return user.uuid == Common::INVALID_UUID; })) { + if (std::ranges::all_of(user_list, [](const auto& user) { return user.IsInvalid(); })) { rb.Push(ResultUnknown); // TODO(ogniK): Find the correct error code rb.PushRaw<u128>(Common::INVALID_UUID); return; diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 24a1c9157..568303ced 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -208,9 +208,10 @@ bool ProfileManager::UserExists(UUID uuid) const { } bool ProfileManager::UserExistsIndex(std::size_t index) const { - if (index >= MAX_USERS) + if (index >= MAX_USERS) { return false; - return profiles[index].user_uuid.uuid != Common::INVALID_UUID; + } + return profiles[index].user_uuid.IsValid(); } /// Opens a specific user @@ -304,7 +305,7 @@ bool ProfileManager::RemoveUser(UUID uuid) { bool ProfileManager::SetProfileBase(UUID uuid, const ProfileBase& profile_new) { const auto index = GetUserIndex(uuid); - if (!index || profile_new.user_uuid == UUID(Common::INVALID_UUID)) { + if (!index || profile_new.user_uuid.IsInvalid()) { return false; } @@ -346,7 +347,7 @@ void ProfileManager::ParseUserSaveFile() { } for (const auto& user : data.users) { - if (user.uuid == UUID(Common::INVALID_UUID)) { + if (user.uuid.IsInvalid()) { continue; } |