diff options
| author | bunnei <bunneidev@gmail.com> | 2022-02-11 05:52:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 05:52:13 +0100 |
| commit | ca9da569ce8d5ce8106ff69afce484d9516570a8 (patch) | |
| tree | db8f98fcfcd3d3d77f77c52b3be696c073f90f6e /src/core/hle/service/am/am.cpp | |
| parent | Merge pull request #7861 from german77/user_features (diff) | |
| parent | common: uuid: Use sizeof(u64) instead of 8 in Hash() (diff) | |
| download | yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.tar yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.tar.gz yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.tar.bz2 yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.tar.lz yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.tar.xz yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.tar.zst yuzu-ca9da569ce8d5ce8106ff69afce484d9516570a8.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..773dc9f29 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::UUID 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}; |