From 2b6628aa652ae58f0fddf618a2b6b0b716d0f069 Mon Sep 17 00:00:00 2001
From: Steve Wills <steve@mouf.net>
Date: Wed, 17 Feb 2021 01:02:44 +0300
Subject: [PATCH] Fix seg fault when configuring controller

---
 src/core/Frontend.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 861e67d1..0f66178b 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1864,8 +1864,13 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
 		}
 
 		// Print bindings, including seperator (-) between them
+
 		CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_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;