diff options
| author | german77 <juangerman-13@hotmail.com> | 2022-05-21 23:40:11 +0200 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-05-27 17:21:09 +0200 |
| commit | 3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2 (patch) | |
| tree | 5b70b8d48ea5e347e551ba334f516055891b5ab2 /src/core/hle/service/hid/hid.cpp | |
| parent | service: hid: Add error handling to setNpadAssignment and variants (diff) | |
| download | yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.gz yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.bz2 yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.lz yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.xz yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.zst yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index b41fc60d6..0520a8a38 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1090,14 +1090,14 @@ void Hid::MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()}; const auto applet_resource_user_id{rp.Pop<u64>()}; - applet_resource->GetController<Controller_NPad>(HidController::NPad) - .MergeSingleJoyAsDualJoy(npad_id_1, npad_id_2); + auto& controller = GetAppletResource()->GetController<Controller_NPad>(HidController::NPad); + const auto result = controller.MergeSingleJoyAsDualJoy(npad_id_1, npad_id_2); LOG_DEBUG(Service_HID, "called, npad_id_1={}, npad_id_2={}, applet_resource_user_id={}", npad_id_1, npad_id_2, applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void Hid::StartLrAssignmentMode(Kernel::HLERequestContext& ctx) { |