X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fprofile.cpp;h=cbb12f47efc7da55c697c34649cb9c573a68e1a1;hb=314c595304e7b95963356d09c7a622d5469dc6f2;hp=114b98c9059cb59e520a08fb87de1c2897a9286f;hpb=62587015fb12ec54b1702bfa17077e4b8af44b19;p=virtualjaguar

diff --git a/src/gui/profile.cpp b/src/gui/profile.cpp
index 114b98c..cbb12f4 100644
--- a/src/gui/profile.cpp
+++ b/src/gui/profile.cpp
@@ -49,6 +49,7 @@ int gamepadIDSlot2;
 int numberOfProfiles;
 int numberOfDevices;
 char deviceNames[MAX_DEVICES][128];
+static int numberOfProfilesSave;
 
 // This is so that new devices have something reasonable to show for default
 uint32_t defaultMap[21] = {
@@ -68,6 +69,7 @@ int FindProfileForDevice(int deviceNum, int preferred, int * found);
 //
 void SaveProfiles(void)
 {
+	numberOfProfilesSave = numberOfProfiles;
 	memcpy(&profileBackup, &profile, sizeof(Profile) * MAX_PROFILES);
 }
 
@@ -75,6 +77,7 @@ void SaveProfiles(void)
 void RestoreProfiles(void)
 {
 	memcpy(&profile, &profileBackup, sizeof(Profile) * MAX_PROFILES);
+	numberOfProfiles = numberOfProfilesSave;
 }
 
 
@@ -357,15 +360,20 @@ One more stab at this...
 */
 void AutoConnectProfiles(void)
 {
-	int foundProfiles[MAX_PROFILES];
+//	int foundProfiles[MAX_PROFILES];
 	controller1Profile = -1;
 	controller2Profile = -1;
 	gamepadIDSlot1 = -1;
 	gamepadIDSlot2 = -1;
 
-	// Connect keyboard devices first... (N.B.: this leaves gampadIDSlot1 at -1,
-	// so it can be overridden by plugged-in gamepads.)
-	ConnectProfileToDevice(0);
+	// Connect the keyboard automagically only if no gamepads are plugged in.
+	// Otherwise, check after all other devices have been checked, then try to
+	// add it in.
+	if (Gamepad::numJoysticks == 0)
+	{
+		ConnectProfileToDevice(0);
+		return;
+	}
 
 	// Connect the profiles that prefer a slot, if any.
 	// N.B.: Conflicts are detected, but ignored. 1st controller to grab a
@@ -437,6 +445,23 @@ void AutoConnectProfiles(void)
 		}
 	}
 
+	// Connect the keyboard device (lowest priority)
+	// N.B.: The keyboard is always mapped to profile #0, so we can locate it
+	//       easily. :-)
+	int slot = profile[0].preferredSlot;
+
+	if ((slot == CONTROLLER1) && (gamepadIDSlot1 == -1))
+		controller1Profile = 0;
+	else if ((slot == CONTROLLER2) && (gamepadIDSlot2 == -1))
+		controller2Profile = 0;
+	else if (slot == (CONTROLLER1 | CONTROLLER2))
+	{
+		if (gamepadIDSlot1 == -1)
+			controller1Profile = 0;
+		else if (gamepadIDSlot2 == -1)
+			controller2Profile = 0;
+	}
+
 	// Finally, attempt to connect profiles to controllers
 	ConnectProfileToController(controller1Profile, 0);
 	ConnectProfileToController(controller2Profile, 1);