diff options
| author | 2019-04-25 08:57:17 -0400 | |
|---|---|---|
| committer | 2019-04-25 08:57:23 -0400 | |
| commit | 4e462d1fd7cbd127eb64de084a97167e586957d3 (patch) | |
| tree | ffeb82921ca64169f06890b85851cb7049871512 | |
| parent | profile_select: Port Service::Account::UUID to Common::UUID (diff) | |
| download | yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.gz yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.tar.xz yuzu-4e462d1fd7cbd127eb64de084a97167e586957d3.zip | |
mii_manager: Fix incorrect loop condition in mii UUID generation code
Diffstat (limited to '')
| -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() { | |||
| 53 | return; | 53 | return; |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | frontend.SelectProfile([this](std::optional<Account::UUID> uuid) { SelectionComplete(uuid); }); | 56 | frontend.SelectProfile([this](std::optional<Common::UUID> uuid) { SelectionComplete(uuid); }); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | void ProfileSelect::SelectionComplete(std::optional<Common::UUID> uuid) { | 59 | 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 @@ | |||
| 8 | 8 | ||
| 9 | #include "common/common_funcs.h" | 9 | #include "common/common_funcs.h" |
| 10 | #include "common/uuid.h" | 10 | #include "common/uuid.h" |
| 11 | #include "core/hle/result.h" | ||
| 11 | #include "core/hle/service/am/applets/applets.h" | 12 | #include "core/hle/service/am/applets/applets.h" |
| 12 | 13 | ||
| 13 | namespace Service::AM::Applets { | 14 | 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 { | |||
| 403 | 403 | ||
| 404 | do { | 404 | do { |
| 405 | new_mii.uuid = Common::UUID::Generate(); | 405 | new_mii.uuid = Common::UUID::Generate(); |
| 406 | } while (IndexOf(new_mii.uuid) == INVALID_INDEX); | 406 | } while (IndexOf(new_mii.uuid) != INVALID_INDEX); |
| 407 | 407 | ||
| 408 | return new_mii; | 408 | return new_mii; |
| 409 | } | 409 | } |