summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
authorGravatar german2021-01-10 08:36:31 -0600
committerGravatar german2021-01-15 09:05:17 -0600
commitb483f2d010bf745ab873e8f8bfaca5515e56d39f (patch)
treed14bc19b4ca1c60460a941db612195be12f16b0d /src/core/hle
parentAdd mutitouch support for touch screens (diff)
downloadyuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.gz
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.tar.xz
yuzu-b483f2d010bf745ab873e8f8bfaca5515e56d39f.zip
Always initialize keyboard input
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/hid/controllers/touchscreen.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
index cd318f25b..5219f2dad 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -100,11 +100,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin
100void Controller_Touchscreen::OnLoadInputDevices() { 100void Controller_Touchscreen::OnLoadInputDevices() {
101 touch_mouse_device = Input::CreateDevice<Input::TouchDevice>("engine:emu_window"); 101 touch_mouse_device = Input::CreateDevice<Input::TouchDevice>("engine:emu_window");
102 touch_udp_device = Input::CreateDevice<Input::TouchDevice>("engine:cemuhookudp"); 102 touch_udp_device = Input::CreateDevice<Input::TouchDevice>("engine:cemuhookudp");
103 if (Settings::values.use_touch_from_button) { 103 touch_btn_device = Input::CreateDevice<Input::TouchDevice>("engine:touch_from_button");
104 touch_btn_device = Input::CreateDevice<Input::TouchDevice>("engine:touch_from_button");
105 } else {
106 touch_btn_device.reset();
107 }
108} 104}
109 105
110std::optional<std::size_t> Controller_Touchscreen::GetUnusedFingerID() const { 106std::optional<std::size_t> Controller_Touchscreen::GetUnusedFingerID() const {