aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/service/acc/profile_manager.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-09-22 17:52:37 -0400
committerLioncash <mathew1800@gmail.com>2021-09-22 17:59:00 -0400
commit40314cc58646e9e91e961e0d82b7d1b53bd839a0 (patch)
tree17ec58af41507fc0edff29325b528ac4029d599b /src/core/hle/service/acc/profile_manager.cpp
parent7b22d61fb1b18d20bf16d940b0002d3668697166 (diff)
common/uuid: Add validity checking functions to interface
Given we have a function to invalidate, we should also have ones to query the validity. Also makes the code more straightforward to read.
Diffstat (limited to 'src/core/hle/service/acc/profile_manager.cpp')
-rw-r--r--src/core/hle/service/acc/profile_manager.cpp9
1 files changed, 5 insertions, 4 deletions
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;
}