Browse Source

Merge pull request #1633 from ogniK5377/reload-input

Fixed HID crash when launching more than 1 game & signaled styleset change event
pull/15/merge
bunnei 7 years ago
committed by GitHub
parent
commit
722e7c05de
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/core/hle/service/hid/controllers/npad.cpp
  2. 2
      src/core/hle/service/hid/hid.cpp

3
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;
}

2
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) {

Loading…
Cancel
Save