diff options
author | german77 <juangerman-13@hotmail.com> | 2021-05-03 04:27:15 +0200 |
---|---|---|
committer | german77 <juangerman-13@hotmail.com> | 2021-05-03 04:27:15 +0200 |
commit | 08d5bd36d83d8ddad7894bb3d5d17c69dc125d18 (patch) | |
tree | 028dbe810df83d0bfa23f549095bf54646792ecb /src/core/hle/service/hid/controllers/gesture.cpp | |
parent | Merge pull request #6269 from lioncash/file-shadow (diff) | |
download | yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.tar yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.tar.gz yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.tar.bz2 yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.tar.lz yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.tar.xz yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.tar.zst yuzu-08d5bd36d83d8ddad7894bb3d5d17c69dc125d18.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/hid/controllers/gesture.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index 71545bf1f..69708c79d 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp @@ -33,7 +33,7 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing, u shared_memory.header.timestamp = core_timing.GetCPUTicks(); shared_memory.header.total_entry_count = 17; - if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) { + if (!IsControllerActivated()) { shared_memory.header.entry_count = 0; shared_memory.header.last_entry_index = 0; return; @@ -129,6 +129,10 @@ void Controller_Gesture::OnLoadInputDevices() { } std::optional<std::size_t> Controller_Gesture::GetUnusedFingerID() const { + // Dont assign any touch input to a point if disabled + if (!Settings::values.touchscreen.enabled) { + return std::nullopt; + } std::size_t first_free_id = 0; while (first_free_id < MAX_POINTS) { if (!fingers[first_free_id].pressed) { |