فهرست منبع

Merge pull request #6264 from german77/touchsetting

hid: Disable touch if setting is not enabled
Morph 5 سال پیش
والد
کامیت
07934f0e87
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 1 1
      src/core/hle/service/hid/controllers/gesture.cpp
  2. 1 1
      src/core/hle/service/hid/controllers/touchscreen.cpp

+ 1 - 1
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.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;

+ 1 - 1
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.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;