diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-24 19:08:07 +0300 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-24 19:08:07 +0300 |
| commit | b728f8de6473409295a551507d16c20109413121 (patch) | |
| tree | 17164205628bd621c80d6b217a479bc5ecc10f1a /src/core | |
| parent | ca1de3cd173efc3e7c838e0dfb167269850e76e0 (diff) | |
Fix out of bound binding orders
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ControllerConfig.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp index fcc4503a..64663b81 100644 --- a/src/core/ControllerConfig.cpp +++ b/src/core/ControllerConfig.cpp @@ -2755,9 +2755,10 @@ wchar *CControllerConfigManager::GetButtonComboText(e_ControllerAction action) void CControllerConfigManager::SetControllerKeyAssociatedWithAction(e_ControllerAction action, int32 key, eControllerType type) { ResetSettingOrder(action); + int numOfSettings = GetNumOfSettingsForAction(action); m_aSettings[action][type].m_Key = key; - m_aSettings[action][type].m_ContSetOrder = GetNumOfSettingsForAction(action) + 1; + m_aSettings[action][type].m_ContSetOrder = numOfSettings + 1; } int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerAction action) @@ -2767,8 +2768,10 @@ int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerA void CControllerConfigManager::SetMouseButtonAssociatedWithAction(e_ControllerAction action, int32 button) { + int numOfSettings = GetNumOfSettingsForAction(action); + m_aSettings[action][MOUSE].m_Key = button; - m_aSettings[action][MOUSE].m_ContSetOrder = GetNumOfSettingsForAction(action) + 1; + m_aSettings[action][MOUSE].m_ContSetOrder = numOfSettings + 1; } void CControllerConfigManager::ResetSettingOrder(e_ControllerAction action) |