summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-10-10 03:48:35 +0200
committerZach Hilman <zachhilman@gmail.com>2018-10-24 01:31:28 +0200
commite7e3d5898e4750e8ca8d859791dddf27705819b9 (patch)
treeb737963f0e36f72d62d9ddce60c9e647dba06790 /src/yuzu_cmd
parentAdded Amiibo support (#1390) (diff)
downloadyuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.tar
yuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.tar.gz
yuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.tar.bz2
yuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.tar.lz
yuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.tar.xz
yuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.tar.zst
yuzu-e7e3d5898e4750e8ca8d859791dddf27705819b9.zip
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/config.cpp22
1 files changed, 19 insertions, 3 deletions
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