diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2019-04-25 14:57:17 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2019-04-25 14:57:23 +0200 |
| commit | 4e462d1fd7cbd127eb64de084a97167e586957d3 (patch) | |
| tree | ffeb82921ca64169f06890b85851cb7049871512 /src | |
| parent | profile_select: Port Service::Account::UUID to Common::UUID (diff) | |
| download | yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.gz yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.bz2 yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.lz yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.xz yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.zst yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/am/applets/profile_select.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/profile_select.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/mii/mii_manager.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/profile_select.cpp index 3c184859d..57b5419e8 100644 --- a/src/core/hle/service/am/applets/profile_select.cpp +++ b/src/core/hle/service/am/applets/profile_select.cpp @@ -53,7 +53,7 @@ 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<Common::UUID> uuid) { diff --git a/src/core/hle/service/am/applets/profile_select.h b/src/core/hle/service/am/applets/profile_select.h index f99630158..563cd744a 100644 --- a/src/core/hle/service/am/applets/profile_select.h +++ b/src/core/hle/service/am/applets/profile_select.h @@ -8,6 +8,7 @@ #include "common/common_funcs.h" #include "common/uuid.h" +#include "core/hle/result.h" #include "core/hle/service/am/applets/applets.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index a526e4440..131b01d62 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -403,7 +403,7 @@ MiiStoreData MiiManager::CreateMiiWithUniqueUUID() const { do { new_mii.uuid = Common::UUID::Generate(); - } while (IndexOf(new_mii.uuid) == INVALID_INDEX); + } while (IndexOf(new_mii.uuid) != INVALID_INDEX); return new_mii; } |