CommonHostInterface: Clear input map before changing interface

Should hopefully fix the crash when changing controller backends.
pull/793/head
Connor McLaughlin 5 years ago
parent 9254fc9e63
commit 5115c75f88

@ -461,6 +461,7 @@ void CommonHostInterface::UpdateControllerInterface()
if (m_controller_interface) if (m_controller_interface)
{ {
ClearInputMap();
m_controller_interface->Shutdown(); m_controller_interface->Shutdown();
m_controller_interface.reset(); m_controller_interface.reset();
} }
@ -938,14 +939,19 @@ bool CommonHostInterface::HandleHostMouseEvent(HostMouseButton button, bool pres
} }
void CommonHostInterface::UpdateInputMap(SettingsInterface& si) void CommonHostInterface::UpdateInputMap(SettingsInterface& si)
{
ClearInputMap();
UpdateControllerInputMap(si);
UpdateHotkeyInputMap(si);
}
void CommonHostInterface::ClearInputMap()
{ {
m_keyboard_input_handlers.clear(); m_keyboard_input_handlers.clear();
m_mouse_input_handlers.clear(); m_mouse_input_handlers.clear();
m_controller_vibration_motors.clear();
if (m_controller_interface) if (m_controller_interface)
m_controller_interface->ClearBindings(); m_controller_interface->ClearBindings();
UpdateControllerInputMap(si);
UpdateHotkeyInputMap(si);
} }
void CommonHostInterface::AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback) void CommonHostInterface::AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback)

@ -217,6 +217,7 @@ protected:
bool HandleHostKeyEvent(HostKeyCode code, bool pressed); bool HandleHostKeyEvent(HostKeyCode code, bool pressed);
bool HandleHostMouseEvent(HostMouseButton button, bool pressed); bool HandleHostMouseEvent(HostMouseButton button, bool pressed);
void UpdateInputMap(SettingsInterface& si); void UpdateInputMap(SettingsInterface& si);
void ClearInputMap();
void AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback); void AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback);
void UpdateControllerRumble(); void UpdateControllerRumble();

Loading…
Cancel
Save