summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/am
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-10-11 03:49:20 +0200
committerZach Hilman <zachhilman@gmail.com>2018-10-24 01:31:28 +0200
commit702622b8f1eaa1b297a27a305ac56faeadf542d7 (patch)
tree8bd4dd63015771d124b5b599240b06d08bfe203f /src/core/hle/service/am
parentacc: Load user images from config dir (diff)
downloadyuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.tar
yuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.tar.gz
yuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.tar.bz2
yuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.tar.lz
yuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.tar.xz
yuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.tar.zst
yuzu-702622b8f1eaa1b297a27a305ac56faeadf542d7.zip
Diffstat (limited to 'src/core/hle/service/am')
-rw-r--r--src/core/hle/service/am/am.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 2dc647ec8..9dfcec59b 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -4,11 +4,13 @@
#include <array>
#include <cinttypes>
+#include <cstring>
#include <stack>
#include "core/core.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/process.h"
+#include "core/hle/service/acc/profile_manager.h"
#include "core/hle/service/am/am.h"
#include "core/hle/service/am/applet_ae.h"
#include "core/hle/service/am/applet_oe.h"
@@ -734,8 +736,10 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
std::vector<u8> buffer(POP_LAUNCH_PARAMETER_BUFFER_SIZE);
std::memcpy(buffer.data(), header_data.data(), header_data.size());
- const auto current_uuid = Settings::values.users[Settings::values.current_user].second.uuid;
- std::memcpy(buffer.data() + header_data.size(), current_uuid.data(), sizeof(u128));
+
+ Account::ProfileManager profile_manager{};
+ const auto uuid = profile_manager.GetAllUsers()[Settings::values.current_user].uuid;
+ std::memcpy(buffer.data() + header_data.size(), uuid.data(), sizeof(u128));
IPC::ResponseBuilder rb{ctx, 2, 0, 1};