X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fprofile.cpp;h=a1bb92692534076041bb3b4794582f168b1e7ebf;hb=c76bbd5328bac525dddb05242fa1f32ebbf202cc;hp=854d8cb038b05408e886b6a51af9ebf66c736494;hpb=0d7e70c5e34e691b15365901951700f43242065f;p=virtualjaguar

diff --git a/src/gui/profile.cpp b/src/gui/profile.cpp
index 854d8cb..a1bb926 100644
--- a/src/gui/profile.cpp
+++ b/src/gui/profile.cpp
@@ -30,7 +30,7 @@
 //
 
 #include "profile.h"
-#include <QtGui>
+#include <QtWidgets>
 #include "gamepad.h"
 #include "log.h"
 #include "settings.h"
@@ -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;
 }
 
 
@@ -94,7 +97,7 @@ void ReadProfiles(QSettings * set)
 	for(int i=1; i<numberOfDevices; i++)
 	{
 		set->setArrayIndex(i - 1);
-		strcpy(deviceNames[i], set->value("deviceName").toString().toAscii().data());
+		strcpy(deviceNames[i], set->value("deviceName").toString().toUtf8().data());
 #ifdef DEBUG_PROFILES
 printf("Read device name: %s\n", deviceNames[i]);
 #endif
@@ -110,7 +113,7 @@ printf("Number of profiles: %u\n", numberOfProfiles);
 	{
 		set->setArrayIndex(i);
 		profile[i].device = set->value("deviceNum").toInt();
-		strcpy(profile[i].mapName, set->value("mapName").toString().toAscii().data());
+		strcpy(profile[i].mapName, set->value("mapName").toString().toUtf8().data());
 		profile[i].preferredSlot = set->value("preferredSlot").toInt();
 
 		for(int j=0; j<21; j++)
@@ -357,7 +360,7 @@ One more stab at this...
 */
 void AutoConnectProfiles(void)
 {
-	int foundProfiles[MAX_PROFILES];
+//	int foundProfiles[MAX_PROFILES];
 	controller1Profile = -1;
 	controller2Profile = -1;
 	gamepadIDSlot1 = -1;
@@ -443,6 +446,8 @@ 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))