summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-05-01 17:28:28 +0200
committerGitHub <noreply@github.com>2021-05-01 17:28:28 +0200
commit07934f0e8795414f4f94f9d36038ce28008848d2 (patch)
tree9963ce7170bd843b1997fa6fb0730dce8f7e1d2a
parentMerge pull request #6257 from Morph1984/fix-use-after-free-webapplet (diff)
parentDisable touch if setting is not enabled (diff)
downloadyuzu-07934f0e8795414f4f94f9d36038ce28008848d2.tar
yuzu-07934f0e8795414f4f94f9d36038ce28008848d2.tar.gz
yuzu-07934f0e8795414f4f94f9d36038ce28008848d2.tar.bz2
yuzu-07934f0e8795414f4f94f9d36038ce28008848d2.tar.lz
yuzu-07934f0e8795414f4f94f9d36038ce28008848d2.tar.xz
yuzu-07934f0e8795414f4f94f9d36038ce28008848d2.tar.zst
yuzu-07934f0e8795414f4f94f9d36038ce28008848d2.zip
-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;