From e7e3d5898e4750e8ca8d859791dddf27705819b9 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Tue, 9 Oct 2018 21:48:35 -0400 Subject: settings: Add users and current_user settings and remove username --- src/yuzu_cmd/config.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src/yuzu_cmd/config.cpp') diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 654a15a5c..613894449 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -126,9 +126,25 @@ void Config::ReadValues() { // System Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false); Settings::values.enable_nfc = sdl2_config->GetBoolean("System", "enable_nfc", true); - Settings::values.username = sdl2_config->Get("System", "username", "yuzu"); - if (Settings::values.username.empty()) { - Settings::values.username = "yuzu"; + 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."); } // Miscellaneous -- cgit v1.2.3 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 From 45f2a2fe29373f261144c097d169dad8b65fe012 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sat, 13 Oct 2018 13:02:33 -0400 Subject: acc: Fix account UUID duplication error --- src/yuzu_cmd/config.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/yuzu_cmd/config.cpp') diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index f6083dcb3..b456266a6 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -8,6 +8,7 @@ #include "common/file_util.h" #include "common/logging/log.h" #include "common/param_package.h" +#include "core/hle/service/acc/profile_manager.h" #include "core/settings.h" #include "input_common/main.h" #include "yuzu_cmd/config.h" @@ -128,8 +129,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.current_user = - std::clamp(sdl2_config->GetInteger("System", "current_user", 0), 0, 7); + Settings::values.current_user = std::clamp( + sdl2_config->GetInteger("System", "current_user", 0), 0, Service::Account::MAX_USERS - 1); // Miscellaneous Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); -- cgit v1.2.3