3 files changed, 28 insertions, 7 deletions

diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index cee309cb1..cf065c2e0 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -106,6 +106,8 @@ private:
         const FileUtil::IOFile image(GetImagePath(user_id), "rb");
 
         if (!image.IsOpen()) {
+            LOG_WARNING(Service_ACC,
+                        "Failed to load user provided image! Falling back to built-in backup...");
             ctx.WriteBuffer(backup_jpeg);
             rb.Push<u32>(backup_jpeg_size);
         } else {
@@ -126,10 +128,13 @@ private:
 
         const FileUtil::IOFile image(GetImagePath(user_id), "rb");
 
-        if (!image.IsOpen())
+        if (!image.IsOpen()) {
+            LOG_WARNING(Service_ACC,
+                        "Failed to load user provided image! Falling back to built-in backup...");
             rb.Push<u32>(backup_jpeg_size);
-        else
+        } else {
             rb.Push<u32>(std::min<u32>(image.GetSize(), MAX_JPEG_IMAGE_SIZE));
+        }
     }
 
     const ProfileManager& profile_manager;
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index 43743d39e..e6f1a0ae8 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -30,6 +30,8 @@ constexpr ResultCode ERROR_TOO_MANY_USERS(ErrorModule::Account, -1);
 constexpr ResultCode ERROR_USER_ALREADY_EXISTS(ErrorModule::Account, -2);
 constexpr ResultCode ERROR_ARGUMENT_IS_NULL(ErrorModule::Account, 20);
 
+constexpr const char* ACC_SAVE_AVATORS_BASE_PATH = "/system/save/8000000000000010/su/avators/";
+
 const UUID& UUID::Generate() {
     std::random_device device;
     std::mt19937 gen(device());
@@ -45,11 +47,11 @@ ProfileManager::ProfileManager() {
     if (user_count == 0)
         CreateNewUser(UUID{}.Generate(), "yuzu");
 
-    auto current = Settings::values.current_user;
-    if (!GetAllUsers()[current])
+    auto current = std::clamp<int>(Settings::values.current_user, 0, MAX_USERS - 1);
+    if (UserExistsIndex(current))
         current = 0;
 
-    OpenUser(GetAllUsers()[current]);
+    OpenUser(*GetUser(current));
 }
 
 ProfileManager::~ProfileManager() {
@@ -126,6 +128,12 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username)
     return CreateNewUser(uuid, username_output);
 }
 
+boost::optional<UUID> ProfileManager::GetUser(std::size_t index) const {
+    if (index >= MAX_USERS)
+        return boost::none;
+    return profiles[index].user_uuid;
+}
+
 /// Returns a users profile index based on their user id.
 boost::optional<std::size_t> ProfileManager::GetUserIndex(const UUID& uuid) const {
     if (!uuid) {
@@ -189,6 +197,12 @@ bool ProfileManager::UserExists(UUID uuid) const {
     return (GetUserIndex(uuid) != boost::none);
 }
 
+bool ProfileManager::UserExistsIndex(std::size_t index) const {
+    if (index >= MAX_USERS)
+        return false;
+    return profiles[index].user_uuid.uuid != INVALID_UUID;
+}
+
 /// Opens a specific user
 void ProfileManager::OpenUser(UUID uuid) {
     auto idx = GetUserIndex(uuid);
@@ -292,7 +306,7 @@ bool ProfileManager::SetProfileBase(UUID uuid, const ProfileBase& profile_new) {
 
 void ProfileManager::ParseUserSaveFile() {
     FileUtil::IOFile save(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
-                              "/system/save/8000000000000010/su/avators/profiles.dat",
+                              ACC_SAVE_AVATORS_BASE_PATH + "profiles.dat",
                           "rb");
 
     ProfileDataRaw data;
@@ -322,7 +336,7 @@ void ProfileManager::WriteUserSaveFile() {
     }
 
     FileUtil::IOFile save(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
-                              "/system/save/8000000000000010/su/avators/profiles.dat",
+                              ACC_SAVE_AVATORS_BASE_PATH + "profiles.dat",
                           "wb");
 
     save.Resize(sizeof(ProfileDataRaw));
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index 1e5c2460e..482c1d8a9 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -96,6 +96,7 @@ public:
     ResultCode AddUser(const ProfileInfo& user);
     ResultCode CreateNewUser(UUID uuid, const ProfileUsername& username);
     ResultCode CreateNewUser(UUID uuid, const std::string& username);
+    boost::optional<UUID> GetUser(std::size_t index) const;
     boost::optional<std::size_t> GetUserIndex(const UUID& uuid) const;
     boost::optional<std::size_t> GetUserIndex(const ProfileInfo& user) const;
     bool GetProfileBase(boost::optional<std::size_t> index, ProfileBase& profile) const;
@@ -109,6 +110,7 @@ public:
     std::size_t GetUserCount() const;
     std::size_t GetOpenUserCount() const;
     bool UserExists(UUID uuid) const;
+    bool UserExistsIndex(std::size_t index) const;
     void OpenUser(UUID uuid);
     void CloseUser(UUID uuid);
     UserIDArray GetOpenUsers() const;