Merge pull request #5842 from german77/userfix

acc: Fix error when second user is selected
This commit is contained in:
bunnei 2021-02-02 15:43:51 -08:00 committed by GitHub
commit 48d040fded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,12 +41,18 @@ constexpr char ACC_SAVE_AVATORS_BASE_PATH[] = "/system/save/8000000000000010/su/
ProfileManager::ProfileManager() { ProfileManager::ProfileManager() {
ParseUserSaveFile(); ParseUserSaveFile();
if (user_count == 0) // Create an user if none are present
if (user_count == 0) {
CreateNewUser(UUID::Generate(), "yuzu"); CreateNewUser(UUID::Generate(), "yuzu");
}
auto current = std::clamp<int>(Settings::values.current_user, 0, MAX_USERS - 1); 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; current = 0;
Settings::values.current_user = 0;
}
OpenUser(*GetUser(current)); OpenUser(*GetUser(current));
} }