diff options
author | bunnei <bunneidev@gmail.com> | 2018-11-05 06:21:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-05 06:21:27 +0100 |
commit | 722e7c05de1287a3f4242b220dcdfe0913713a3e (patch) | |
tree | 0a8e0889e248f83b2edaf1b1e315d4c4c3ba6d4f /src/core | |
parent | Merge pull request #1441 from CarlKenner/DebuggerLog (diff) | |
parent | Fixed HID crash when launching more than 1 game & signaled syleset change event (diff) | |
download | yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.tar yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.tar.gz yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.tar.bz2 yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.tar.lz yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.tar.xz yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.tar.zst yuzu-722e7c05de1287a3f4242b220dcdfe0913713a3e.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/service/hid/hid.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
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<u32>& controller_ids, } Kernel::SharedPtr<Kernel::Event> 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) { |