From 702622b8f1eaa1b297a27a305ac56faeadf542d7 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 10 Oct 2018 21:49:20 -0400 Subject: profile_manager: Load user icons, names, and UUIDs from system save --- src/yuzu_cmd/config.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/yuzu_cmd/config.cpp') diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 613894449..f6083dcb3 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -128,24 +128,8 @@ void Config::ReadValues() { Settings::values.enable_nfc = sdl2_config->GetBoolean("System", "enable_nfc", true); const auto size = sdl2_config->GetInteger("System", "users_size", 0); - Settings::values.users.clear(); - for (std::size_t i = 0; i < size; ++i) { - const auto uuid_low = std::stoull( - sdl2_config->Get("System", fmt::format("users_{}_uuid_low", i), "0"), nullptr, 0); - const auto uuid_high = std::stoull( - sdl2_config->Get("System", fmt::format("users_{}_uuid_high", i), "0"), nullptr, 0); - Settings::values.users.emplace_back( - sdl2_config->Get("System", fmt::format("users_{}_username", i), ""), - Service::Account::UUID{uuid_low, uuid_high}); - } - - if (Settings::values.users.empty()) { - Settings::values.users.emplace_back("yuzu", Service::Account::UUID{1, 0}); - LOG_WARNING( - Config, - "You are using the default UUID of {1, 0}! This might cause issues down the road! " - "Please consider randomizing a UUID and adding it to the sdl2_config.ini file."); - } + Settings::values.current_user = + std::clamp(sdl2_config->GetInteger("System", "current_user", 0), 0, 7); // Miscellaneous Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); -- cgit v1.2.3