diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-10-10 21:49:20 -0400 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-10-23 19:31:28 -0400 |
| commit | 702622b8f1eaa1b297a27a305ac56faeadf542d7 (patch) | |
| tree | 8bd4dd63015771d124b5b599240b06d08bfe203f /src/yuzu/main.cpp | |
| parent | 19c5cf9c637d7fb685ca6977fb7cbf06e075cedf (diff) | |
profile_manager: Load user icons, names, and UUIDs from system save
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 1de3b817f8..9a3535e77e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -10,6 +10,7 @@ // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. #include "core/file_sys/vfs.h" #include "core/file_sys/vfs_real.h" +#include "core/hle/service/acc/profile_manager.h" // These are wrappers to avoid the calls to CreateDirectory and CreateFile becuase of the Windows // defines. @@ -758,10 +759,22 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target const std::string nand_dir = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir); ASSERT(program_id != 0); - QStringList list{}; - std::transform(Settings::values.users.begin(), Settings::values.users.end(), - std::back_inserter(list), - [](const auto& user) { return QString::fromStdString(user.first); }); + Service::Account::ProfileManager manager{}; + const auto user_ids = manager.GetAllUsers(); + QStringList list; + std::transform( + user_ids.begin(), user_ids.end(), std::back_inserter(list), + [&manager](const auto& user_id) -> QString { + if (user_id == Service::Account::UUID{}) + return ""; + Service::Account::ProfileBase base; + if (!manager.GetProfileBase(user_id, base)) + return ""; + + return QString::fromStdString(Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast<const char*>(base.username.data()), base.username.size())); + }); + list.removeAll(""); bool ok = false; const auto index_string = @@ -772,12 +785,12 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target return; const auto index = list.indexOf(index_string); - ASSERT(index != -1); + ASSERT(index != -1 && index < 8); - const auto user_id = Settings::values.users[index].second.uuid; + const auto user_id = manager.GetAllUsers()[index]; path = nand_dir + FileSys::SaveDataFactory::GetFullPath(FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData, - program_id, user_id, 0); + program_id, user_id.uuid, 0); if (!FileUtil::Exists(path)) { FileUtil::CreateFullPath(path); |