Merge branch 'master' into master

2019-10-27 06:36:58 +03:00
parent 9d0757eebe 537aaca5c2
commit 6a46cc6c3b
18 changed files with 2873 additions and 327 deletions
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@ -1466,7 +1466,7 @@ void CMenuManager::Process(void)
 				else {
 					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
 					for (int i = 0; i < 4; i++)
-						ControlsManager.ClearSettingsAssociatedWithAction(m_CurrCntrlAction, i);
+						ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
 					field_534 = false;
 					m_bKeyChangeNotProcessed = false;
 					pControlEdit = nil;