diff options
author | bunnei <bunneidev@gmail.com> | 2019-05-30 19:26:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-30 19:26:40 +0200 |
commit | ed74a3cb8b69841bd34344b1387320c0d8912979 (patch) | |
tree | f914218f6a5965ad6c47bd9acab096ab22356d5d /src/core/frontend | |
parent | Merge pull request #2431 from DarkLordZach/game-list-cache (diff) | |
parent | mii_manager: Fix incorrect loop condition in mii UUID generation code (diff) | |
download | yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.gz yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.bz2 yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.lz yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.xz yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.zst yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.zip |
Diffstat (limited to 'src/core/frontend')
-rw-r--r-- | src/core/frontend/applets/profile_select.cpp | 5 | ||||
-rw-r--r-- | src/core/frontend/applets/profile_select.h | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index fbf5f2a9e..4df3574d2 100644 --- a/src/core/frontend/applets/profile_select.cpp +++ b/src/core/frontend/applets/profile_select.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "core/frontend/applets/profile_select.h" +#include "core/hle/service/acc/profile_manager.h" #include "core/settings.h" namespace Core::Frontend { @@ -10,9 +11,9 @@ namespace Core::Frontend { ProfileSelectApplet::~ProfileSelectApplet() = default; void DefaultProfileSelectApplet::SelectProfile( - std::function<void(std::optional<Service::Account::UUID>)> callback) const { + std::function<void(std::optional<Common::UUID>)> callback) const { Service::Account::ProfileManager manager; - callback(manager.GetUser(Settings::values.current_user).value_or(Service::Account::UUID{})); + callback(manager.GetUser(Settings::values.current_user).value_or(Common::UUID{})); LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); } diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h index fc8f7ae94..3506b9885 100644 --- a/src/core/frontend/applets/profile_select.h +++ b/src/core/frontend/applets/profile_select.h @@ -6,7 +6,7 @@ #include <functional> #include <optional> -#include "core/hle/service/acc/profile_manager.h" +#include "common/uuid.h" namespace Core::Frontend { @@ -14,14 +14,12 @@ class ProfileSelectApplet { public: virtual ~ProfileSelectApplet(); - virtual void SelectProfile( - std::function<void(std::optional<Service::Account::UUID>)> callback) const = 0; + virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0; }; class DefaultProfileSelectApplet final : public ProfileSelectApplet { public: - void SelectProfile( - std::function<void(std::optional<Service::Account::UUID>)> callback) const override; + void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override; }; } // namespace Core::Frontend |