Browse Source
Merge pull request #6264 from german77/touchsetting
hid: Disable touch if setting is not enabled
pull/15/merge
Morph
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
src/core/hle/service/hid/controllers/gesture.cpp
-
src/core/hle/service/hid/controllers/touchscreen.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; |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
