From 0bc323bafb79442ead1511a5d7ee08f1caff171a Mon Sep 17 00:00:00 2001 From: David Marcec Date: Fri, 2 Nov 2018 12:35:49 +1100 Subject: Fixed HID crash when launching more than 1 game & signaled syleset change event This should fix crashes when launching multiple games in yuzu --- src/core/hle/service/hid/controllers/npad.cpp | 3 +++ src/core/hle/service/hid/hid.cpp | 2 ++ 2 files changed, 5 insertions(+) (limited to 'src/core/hle/service') diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 4b4d1324f..1ef789bd0 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -427,6 +427,9 @@ void Controller_NPad::VibrateController(const std::vector& controller_ids, } Kernel::SharedPtr Controller_NPad::GetStyleSetChangedEvent() const { + // TODO(ogniK): Figure out the best time to signal this event. This event seems that it should + // be signalled at least once, and signaled after a new controller is connected? + styleset_changed_event->Signal(); return styleset_changed_event; } diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index a9aa9ec78..a45fd4954 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -96,6 +96,8 @@ public: // TODO(shinyquagsire23): Other update callbacks? (accel, gyro?) CoreTiming::ScheduleEvent(pad_update_ticks, pad_update_event); + + ReloadInputDevices(); } void ActivateController(HidController controller) { -- cgit v1.2.3