CommonHostInterface: Clear input map before changing interface
Should hopefully fix the crash when changing controller backends.
This commit is contained in:
parent
9254fc9e63
commit
5115c75f88
2 changed files with 10 additions and 3 deletions
|
|
@ -461,6 +461,7 @@ void CommonHostInterface::UpdateControllerInterface()
|
|||
|
||||
if (m_controller_interface)
|
||||
{
|
||||
ClearInputMap();
|
||||
m_controller_interface->Shutdown();
|
||||
m_controller_interface.reset();
|
||||
}
|
||||
|
|
@ -939,15 +940,20 @@ bool CommonHostInterface::HandleHostMouseEvent(HostMouseButton button, bool pres
|
|||
|
||||
void CommonHostInterface::UpdateInputMap(SettingsInterface& si)
|
||||
{
|
||||
m_keyboard_input_handlers.clear();
|
||||
m_mouse_input_handlers.clear();
|
||||
if (m_controller_interface)
|
||||
m_controller_interface->ClearBindings();
|
||||
|
||||
ClearInputMap();
|
||||
UpdateControllerInputMap(si);
|
||||
UpdateHotkeyInputMap(si);
|
||||
}
|
||||
|
||||
void CommonHostInterface::ClearInputMap()
|
||||
{
|
||||
m_keyboard_input_handlers.clear();
|
||||
m_mouse_input_handlers.clear();
|
||||
m_controller_vibration_motors.clear();
|
||||
if (m_controller_interface)
|
||||
m_controller_interface->ClearBindings();
|
||||
}
|
||||
|
||||
void CommonHostInterface::AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback)
|
||||
{
|
||||
ControllerRumbleState rumble;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue