From 4e462d1fd7cbd127eb64de084a97167e586957d3 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Thu, 25 Apr 2019 08:57:17 -0400 Subject: mii_manager: Fix incorrect loop condition in mii UUID generation code --- src/core/hle/service/am/applets/profile_select.cpp | 2 +- src/core/hle/service/am/applets/profile_select.h | 1 + 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 uuid) { SelectionComplete(uuid); }); + frontend.SelectProfile([this](std::optional uuid) { SelectionComplete(uuid); }); } void ProfileSelect::SelectionComplete(std::optional 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; } -- cgit v1.2.3