Merge pull request #1050 from swills/controller_config_segfault_fix

Fix seg fault when configuring controller
GTAmodding · Feb 16, 2021 · 4d8f34082757f0c4d1656d392e5043e1fd73335a · 4d8f340
2 parents eccf87a + e482ab6
commit 4d8f34082757f0c4d1656d392e5043e1fd73335a
Unified Split

Showing with 4 additions and 0 deletions.

+4 −0 src/core/Frontend.cpp
diff --git 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;