diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-16 22:29:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 22:29:55 +0300 |
| commit | 4d8f34082757f0c4d1656d392e5043e1fd73335a (patch) | |
| tree | 6a3640fc34102281613a0ec2b6a69c5332cbdc6e /src/core | |
| parent | eccf87acc7d6dad2987c39e353197bb77481f285 (diff) | |
| parent | e482ab629218dba31c95e1bdc13e0296a3aa53ef (diff) | |
Merge pull request #1050 from swills/controller_config_segfault_fix
Fix seg fault when configuring controller
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Frontend.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 07b8f996..9c6d6f24 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -2166,7 +2166,11 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8 // Print bindings, including seperator (-) between them CFont::SetScale(MENU_X(0.25f), MENU_Y(SMALLESTTEXT_Y_SCALE)); +#ifdef FIX_BUGS + for (; contSetOrder < MAX_SETORDERS && controllerAction >= 0; contSetOrder++) { +#else for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) { +#endif wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder); if (settingText) { ++bindingsForThisOpt; |