From 702622b8f1eaa1b297a27a305ac56faeadf542d7 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Wed, 10 Oct 2018 21:49:20 -0400
Subject: profile_manager: Load user icons, names, and UUIDs from system save
---
src/yuzu/configuration/config.cpp | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
(limited to 'src/yuzu/configuration/config.cpp')
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 36f0c4f4c8..f7a9a8dd49 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -4,6 +4,7 @@
#include <QSettings>
#include "common/file_util.h"
+#include "core/hle/service/acc/profile_manager.h"
#include "input_common/main.h"
#include "yuzu/configuration/config.h"
#include "yuzu/ui_settings.h"
@@ -124,23 +125,7 @@ void Config::ReadValues() {
Settings::values.use_docked_mode = qt_config->value("use_docked_mode", false).toBool();
Settings::values.enable_nfc = qt_config->value("enable_nfc", true).toBool();
- Settings::values.users.clear();
- const auto size = qt_config->beginReadArray("users");
- for (int i = 0; i < size; ++i) {
- qt_config->setArrayIndex(i);
- const Service::Account::UUID uuid(qt_config->value("uuid_low").toULongLong(),
- qt_config->value("uuid_high").toULongLong());
- Settings::values.users.emplace_back(qt_config->value("username").toString().toStdString(),
- uuid);
- }
-
- qt_config->endArray();
-
- if (Settings::values.users.empty())
- Settings::values.users.emplace_back("yuzu", Service::Account::UUID{}.Generate());
-
- Settings::values.current_user =
- std::clamp(qt_config->value("current_user", 0).toInt(), 0, size);
+ Settings::values.current_user = std::clamp(qt_config->value("current_user", 0).toInt(), 0, 7);
Settings::values.language_index = qt_config->value("language_index", 1).toInt();
qt_config->endGroup();
@@ -280,17 +265,6 @@ void Config::SaveValues() {
qt_config->setValue("enable_nfc", Settings::values.enable_nfc);
qt_config->setValue("current_user", Settings::values.current_user);
- qt_config->beginWriteArray("users", Settings::values.users.size());
- for (std::size_t i = 0; i < Settings::values.users.size(); ++i) {
- qt_config->setArrayIndex(i);
- const auto& user = Settings::values.users[i];
- qt_config->setValue("uuid_low", user.second.uuid[0]);
- qt_config->setValue("uuid_high", user.second.uuid[1]);
- qt_config->setValue("username", QString::fromStdString(user.first));
- }
-
- qt_config->endArray();
-
qt_config->setValue("language_index", Settings::values.language_index);
qt_config->endGroup();
--
cgit v1.2.3-70-g09d2