From f334246f841503ef95b0c624f035730962046ae5 Mon Sep 17 00:00:00 2001
From: Yoshi Sugawara <yoshi@transfix.io>
Date: Tue, 29 Mar 2016 12:19:37 -0400
Subject: [PATCH] enabling iCade in options menu will force iCade mode to be
 enabled

---
 Common.iphone/KBDController.mm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Common.iphone/KBDController.mm b/Common.iphone/KBDController.mm
index 90468cc..6a3dc8c 100644
--- a/Common.iphone/KBDController.mm
+++ b/Common.iphone/KBDController.mm
@@ -549,7 +549,11 @@ extern int findCode(const char* _s);
     externalKeyboard = FALSE;
 
     [self detectHardwareKeyboard:nil];
-    
+
+    // If iCade explicitly selected in options, force enable it
+    if ( option.getIntValue(OPTION_JOYSTICKMODE) == JOYSTICK_TYPE_ICADE ) {
+        [self setiCadeMode:YES];
+    }
 
     [self setInputMode:INPUTMODE_ACCESS+INPUTMODE_HIDDEN];
 	[self setMenuBarVisibility:TRUE]; // So First time users are not lost!
@@ -596,12 +600,13 @@ int hardwarekeyboard= 0;
         option.setIntValue(OPTION_JOYSTICKMODE,JOYSTICK_TYPE_ICADE);
         [self setInputMode:inputMode&INPUTMODE_PAD];
         [pManager setNotificationText:@"iCade activated"];
+        g_joystick_type = JOYSTICK_TYPE_ICADE;
     }
     else
     {
         option.setIntValue(OPTION_JOYSTICKMODE,JOYSTICK_TYPE_NATIVE_1);
         [pManager setNotificationText:@"iCade de-activated"];
-        
+        g_joystick_type = JOYSTICK_TYPE_NATIVE_1;
     }   
     
     [self refreshControls:nil];