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/hle/service/am | |
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/hle/service/am')
-rw-r--r-- | src/core/hle/service/am/applets/profile_select.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/profile_select.h | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/profile_select.cpp index d113bd2eb..57b5419e8 100644 --- a/src/core/hle/service/am/applets/profile_select.cpp +++ b/src/core/hle/service/am/applets/profile_select.cpp @@ -53,19 +53,19 @@ void ProfileSelect::Execute() { return; } - frontend.SelectProfile([this](std::optional<Account::UUID> uuid) { SelectionComplete(uuid); }); + frontend.SelectProfile([this](std::optional<Common::UUID> uuid) { SelectionComplete(uuid); }); } -void ProfileSelect::SelectionComplete(std::optional<Account::UUID> uuid) { +void ProfileSelect::SelectionComplete(std::optional<Common::UUID> uuid) { UserSelectionOutput output{}; - if (uuid.has_value() && uuid->uuid != Account::INVALID_UUID) { + if (uuid.has_value() && uuid->uuid != Common::INVALID_UUID) { output.result = 0; output.uuid_selected = uuid->uuid; } else { status = ERR_USER_CANCELLED_SELECTION; output.result = ERR_USER_CANCELLED_SELECTION.raw; - output.uuid_selected = Account::INVALID_UUID; + output.uuid_selected = Common::INVALID_UUID; } final_data = std::vector<u8>(sizeof(UserSelectionOutput)); diff --git a/src/core/hle/service/am/applets/profile_select.h b/src/core/hle/service/am/applets/profile_select.h index a2ac6cf50..563cd744a 100644 --- a/src/core/hle/service/am/applets/profile_select.h +++ b/src/core/hle/service/am/applets/profile_select.h @@ -7,7 +7,8 @@ #include <vector> #include "common/common_funcs.h" -#include "core/hle/service/acc/profile_manager.h" +#include "common/uuid.h" +#include "core/hle/result.h" #include "core/hle/service/am/applets/applets.h" namespace Service::AM::Applets { @@ -38,7 +39,7 @@ public: void ExecuteInteractive() override; void Execute() override; - void SelectionComplete(std::optional<Account::UUID> uuid); + void SelectionComplete(std::optional<Common::UUID> uuid); private: const Core::Frontend::ProfileSelectApplet& frontend; |