Browse Source
Merge pull request #5842 from german77/userfix
acc: Fix error when second user is selected
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
8 additions and
2 deletions
-
src/core/hle/service/acc/profile_manager.cpp
|
|
|
@ -41,12 +41,18 @@ constexpr char ACC_SAVE_AVATORS_BASE_PATH[] = "/system/save/8000000000000010/su/ |
|
|
|
ProfileManager::ProfileManager() { |
|
|
|
ParseUserSaveFile(); |
|
|
|
|
|
|
|
if (user_count == 0) |
|
|
|
// Create an user if none are present
|
|
|
|
if (user_count == 0) { |
|
|
|
CreateNewUser(UUID::Generate(), "yuzu"); |
|
|
|
} |
|
|
|
|
|
|
|
auto current = std::clamp<int>(Settings::values.current_user, 0, MAX_USERS - 1); |
|
|
|
if (UserExistsIndex(current)) |
|
|
|
|
|
|
|
// If user index don't exist. Load the first user and change the active user
|
|
|
|
if (!UserExistsIndex(current)) { |
|
|
|
current = 0; |
|
|
|
Settings::values.current_user = 0; |
|
|
|
} |
|
|
|
|
|
|
|
OpenUser(*GetUser(current)); |
|
|
|
} |
|
|
|
|