diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-10-10 03:49:06 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-10-24 01:31:28 +0200 |
commit | aeffd4b436dceb798b4ffc1f8babb350a741280a (patch) | |
tree | 5e58ed9cd4773f0fecfe87d80c8906f95b6780fd /src/core/hle/service | |
parent | settings: Add users and current_user settings and remove username (diff) | |
download | yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.tar yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.tar.gz yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.tar.bz2 yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.tar.lz yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.tar.xz yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.tar.zst yuzu-aeffd4b436dceb798b4ffc1f8babb350a741280a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/acc/profile_manager.cpp | 10 | ||||
-rw-r--r-- | src/core/hle/service/acc/profile_manager.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index bcb3475db..b4b4b52b7 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -23,10 +23,12 @@ const UUID& UUID::Generate() { } ProfileManager::ProfileManager() { - // TODO(ogniK): Create the default user we have for now until loading/saving users is added - auto user_uuid = UUID{1, 0}; - ASSERT(CreateNewUser(user_uuid, Settings::values.username).IsSuccess()); - OpenUser(user_uuid); + for (std::size_t i = 0; i < Settings::values.users.size(); ++i) { + const auto& val = Settings::values.users[i]; + ASSERT(CreateNewUser(val.second, val.first).IsSuccess()); + } + + OpenUser(Settings::values.users[Settings::values.current_user].second); } ProfileManager::~ProfileManager() = default; diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h index bffd4cf4d..9ce3eb47c 100644 --- a/src/core/hle/service/acc/profile_manager.h +++ b/src/core/hle/service/acc/profile_manager.h @@ -81,7 +81,7 @@ static_assert(sizeof(ProfileBase) == 0x38, "ProfileBase is an invalid size"); /// objects class ProfileManager { public: - ProfileManager(); // TODO(ogniK): Load from system save + ProfileManager(); ~ProfileManager(); ResultCode AddUser(const ProfileInfo& user); |