summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-05-01 02:28:21 +0200
committergerman77 <juangerman-13@hotmail.com>2021-05-01 02:28:21 +0200
commit1ed1dd3c894bd765094720da2e8654d2f4e7e603 (patch)
tree9963ce7170bd843b1997fa6fb0730dce8f7e1d2a /src/core
parentMerge pull request #6257 from Morph1984/fix-use-after-free-webapplet (diff)
downloadyuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.tar
yuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.tar.gz
yuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.tar.bz2
yuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.tar.lz
yuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.tar.xz
yuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.tar.zst
yuzu-1ed1dd3c894bd765094720da2e8654d2f4e7e603.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/controllers/gesture.cpp2
-rw-r--r--src/core/hle/service/hid/controllers/touchscreen.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp
index 155808f6a..71545bf1f 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()) {
+ if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) {
shared_memory.header.entry_count = 0;
shared_memory.header.last_entry_index = 0;
return;
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
index b5f8077be..8f56a0255 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -33,7 +33,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin
shared_memory.header.timestamp = core_timing.GetCPUTicks();
shared_memory.header.total_entry_count = 17;
- if (!IsControllerActivated()) {
+ if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) {
shared_memory.header.entry_count = 0;
shared_memory.header.last_entry_index = 0;
return;