yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #6264 from german77/touchsetting 

hid: Disable touch if setting is not enabled
This commit is contained in:
Morph 2021-05-01 11:28:28 -04:00 committed by GitHub
parent fa3ffff8de 1ed1dd3c89
commit 07934f0e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/service/hid/controllers/gesture.cpp
View File

@ -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.timestamp = core_timing.GetCPUTicks();
shared_memory.header.total_entry_count = 17; shared_memory.header.total_entry_count = 17;
if (!IsControllerActivated()) { if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) {
shared_memory.header.entry_count = 0; shared_memory.header.entry_count = 0;
shared_memory.header.last_entry_index = 0; shared_memory.header.last_entry_index = 0;
return; return;

2
src/core/hle/service/hid/controllers/touchscreen.cpp
View File

@ -33,7 +33,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin
shared_memory.header.timestamp = core_timing.GetCPUTicks(); shared_memory.header.timestamp = core_timing.GetCPUTicks();
shared_memory.header.total_entry_count = 17; shared_memory.header.total_entry_count = 17;
if (!IsControllerActivated()) { if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) {
shared_memory.header.entry_count = 0; shared_memory.header.entry_count = 0;
shared_memory.header.last_entry_index = 0; shared_memory.header.last_entry_index = 0;
return; return;