Cocoa Port:

- Fix bug where the default input profile was not being applied when user defaults contained no input mappings.
- Rename keyboard key name "-" to "- (Dash)".

desmume/src/cocoa/DefaultKeyMappings.plist

@@ -371,7 +371,7 @@
 				<array>
 					<dict>
 						<key>deviceInfoSummary</key>
-						<string>Keyboard: -</string>
+						<string>Keyboard: - (Dash)</string>
 						<key>deviceCode</key>
 						<string>NSEventKeyboard</string>
 						<key>deviceName</key>
@@ -379,7 +379,7 @@
 						<key>elementCode</key>
 						<string>27</string>
 						<key>elementName</key>
-						<string>-</string>
+						<string>- (Dash)</string>
 						<key>inputSettingsSummary</key>
 						<string>0.50x Speed</string>
 						<key>floatValue0</key>

desmume/src/cocoa/KeyNames.plist

@@ -115,7 +115,7 @@
 	<key>50</key>
 	<string>` (Accent)</string>
 	<key>27</key>
-	<string>-</string>
+	<string>- (Dash)</string>
 	<key>24</key>
 	<string>=</string>
 	<key>51</key>

desmume/src/cocoa/userinterface/InputManager.mm

@@ -973,8 +973,6 @@ static std::tr1::unordered_map<unsigned short, std::string> keyboardNameTable; /
 	[self addMappingForIBAction:@selector(reset:) commandAttributes:&cmdReset];
 	[self addMappingForIBAction:@selector(toggleGPUState:) commandAttributes:&cmdToggleGPUState];
 	
-	[self setMappingsWithMappings:[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"Input_ControllerMappings"]];
-	
 	return self;
 }
 

desmume/src/cocoa/userinterface/appDelegate.mm

@@ -545,6 +545,18 @@
 	// Set the default sound volume per user preferences.
 	[prefWindowDelegate updateVolumeIcon:nil];
 	
+	// Set up the user's default input settings.
+	NSDictionary *userMappings = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"Input_ControllerMappings"];
+	if (userMappings == nil)
+	{
+		NSDictionary *defaultKeyMappingsDict = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DefaultKeyMappings" ofType:@"plist"]];
+		NSArray *internalDefaultProfilesList = (NSArray *)[defaultKeyMappingsDict valueForKey:@"DefaultInputProfiles"];
+		userMappings = [(NSDictionary *)[internalDefaultProfilesList objectAtIndex:0] valueForKey:@"Mappings"];
+	}
+	
+	[inputManager setMappingsWithMappings:userMappings];
+	
+	// Set up the rest of the emulation-related user defaults.
 	[emuControl setupUserDefaults];
 }