diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 18:29:09 +0100 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 19:56:21 +0100 |
commit | dfe11d72e3eb14dee718b7fa67a673514d199f20 (patch) | |
tree | f21885d513c2df4bb409e17016e0996815e37569 /src/core/hle/service/am/am.cpp | |
parent | common: uuid: Add AsU128() (diff) | |
download | yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.gz yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.bz2 yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.lz yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.xz yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.tar.zst yuzu-dfe11d72e3eb14dee718b7fa67a673514d199f20.zip |
Diffstat (limited to 'src/core/hle/service/am/am.cpp')
-rw-r--r-- | src/core/hle/service/am/am.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index e60661fe1..4cdc029b7 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -55,7 +55,7 @@ constexpr u32 LAUNCH_PARAMETER_ACCOUNT_PRESELECTED_USER_MAGIC = 0xC79497CA; struct LaunchParameterAccountPreselectedUser { u32_le magic; u32_le is_account_selected; - u128 current_user; + Common::NewUUID current_user; INSERT_PADDING_BYTES(0x70); }; static_assert(sizeof(LaunchParameterAccountPreselectedUser) == 0x88); @@ -1453,8 +1453,8 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { Account::ProfileManager profile_manager{}; const auto uuid = profile_manager.GetUser(static_cast<s32>(Settings::values.current_user)); - ASSERT(uuid); - params.current_user = uuid->uuid; + ASSERT(uuid.has_value() && uuid->IsValid()); + params.current_user = *uuid; IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |