From 2dabab907bcb86ca4f1d88962f75411215cb115e Mon Sep 17 00:00:00 2001
From: Nick Westgate <nick.westgate@gmail.com>
Date: Mon, 5 Jun 2017 10:09:36 +1200
Subject: [PATCH] Joystick combo boxes logic correction fixes #426 (#427)

* Joystick combo boxes logic correction fixes #426
---
 source/Configuration/PageInput.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source/Configuration/PageInput.cpp b/source/Configuration/PageInput.cpp
index 7bd0a20b..825a34dc 100644
--- a/source/Configuration/PageInput.cpp
+++ b/source/Configuration/PageInput.cpp
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 CPageInput* CPageInput::ms_this = 0;	// reinit'd in ctor
 
+// Joystick option choices - NOTE maximum text length is MaxMenuChoiceLen = 40
 const TCHAR CPageInput::m_szJoyChoice0[] = TEXT("Disabled\0");
 const TCHAR CPageInput::m_szJoyChoice1[] = TEXT("PC Joystick #1\0");
 const TCHAR CPageInput::m_szJoyChoice2[] = TEXT("PC Joystick #2\0");
@@ -302,17 +303,24 @@ void CPageInput::InitJoystickChoices(HWND hWnd, int nJoyNum, int nIdcValue)
 	// Now exclude:
 	// . the other Joystick type (if it exists) from this new list
 	// . the mouse if the mousecard is plugged in
+	int removedItemCompensation = 0;
 	for(UINT i=nJC_KEYBD_CURSORS; i<nJC_MAX; i++)
 	{
 		if( ( (i == nJC_KEYBD_CURSORS) || (i == nJC_KEYBD_NUMPAD) ) &&
 			( (JoyGetJoyType(nOtherJoyNum) == nJC_KEYBD_CURSORS) || (JoyGetJoyType(nOtherJoyNum) == nJC_KEYBD_NUMPAD) )
 		  )
 		{
+			if (i <= JoyGetJoyType(nJoyNum))
+				removedItemCompensation++;
 			continue;
 		}
 
 		if (i == nJC_MOUSE && bIsSlot4Mouse)
+		{
+			if (i <= JoyGetJoyType(nJoyNum))
+				removedItemCompensation++;
 			continue;
+		}
 
 		if (JoyGetJoyType(nOtherJoyNum) != i)
 		{
@@ -324,7 +332,7 @@ void CPageInput::InitJoystickChoices(HWND hWnd, int nJoyNum, int nIdcValue)
 
 	*pszMem = 0x00;	// Doubly null terminated
 
-	m_PropertySheetHelper.FillComboBox(hWnd, nIdcValue, pnzJoystickChoices, JoyGetJoyType(nJoyNum));
+	m_PropertySheetHelper.FillComboBox(hWnd, nIdcValue, pnzJoystickChoices, JoyGetJoyType(nJoyNum) - removedItemCompensation);
 }
 
 void CPageInput::InitSlotOptions(HWND hWnd)