diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-23 06:30:34 +0100 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-26 00:14:18 +0100 |
| commit | 53b321c945d7e6782a6011b7ee55035da8f54dbc (patch) | |
| tree | ab538a4d934f71453bd4b16a929599ae5f525668 /src/hid_core/resource_manager.cpp | |
| parent | Merge pull request #12759 from liamwhite/mp-misc (diff) | |
| download | yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.tar yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.tar.gz yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.tar.bz2 yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.tar.lz yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.tar.xz yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.tar.zst yuzu-53b321c945d7e6782a6011b7ee55035da8f54dbc.zip | |
Diffstat (limited to 'src/hid_core/resource_manager.cpp')
| -rw-r--r-- | src/hid_core/resource_manager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cpp index ca824b4a3..755f82f29 100644 --- a/src/hid_core/resource_manager.cpp +++ b/src/hid_core/resource_manager.cpp @@ -6,6 +6,8 @@ #include "core/core_timing.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/service/ipc_helpers.h" +#include "core/hle/service/set/system_settings_server.h" +#include "core/hle/service/sm/sm.h" #include "hid_core/hid_core.h" #include "hid_core/hid_util.h" #include "hid_core/resource_manager.h" @@ -180,7 +182,11 @@ void ResourceManager::InitializeHidCommonSampler() { debug_pad->SetAppletResource(applet_resource, &shared_mutex); digitizer->SetAppletResource(applet_resource, &shared_mutex); keyboard->SetAppletResource(applet_resource, &shared_mutex); - npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config); + + const auto settings = + system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys"); + npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config, settings); + six_axis->SetAppletResource(applet_resource, &shared_mutex); mouse->SetAppletResource(applet_resource, &shared_mutex); debug_mouse->SetAppletResource(applet_resource, &shared_mutex); |