Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-12 01:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Cope with invalid keyboard ids

Browse Source
This commit is contained in:
nigel 2003-08-16 11:16:36 +00:00
parent 14a5fd6aaf
commit 415c2721bc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BasiliskII/src/MacOSX/PrefsEditor.mm
View File

@ -298,10 +298,8 @@ extern string UserPrefsPath; // from prefs_unix.cpp
- (IBAction) ChangeKeyboard: (NSPopUpButton *)sender - (IBAction) ChangeKeyboard: (NSPopUpButton *)sender
{ {
// Deselest current item // Deselest current item
int val = PrefsFindInt32("keyboardtype"); int current = [keyboard indexOfItemWithTag: PrefsFindInt32("keyboardtype")];
int current = [keyboard indexOfItemWithTag: val]; if ( current != -1 )
if ( current )
[[keyboard itemAtIndex: current] setState: FALSE]; [[keyboard itemAtIndex: current] setState: FALSE];
PrefsReplaceInt32("keyboardtype", [[sender selectedItem] tag]); PrefsReplaceInt32("keyboardtype", [[sender selectedItem] tag]);
@ -774,7 +772,9 @@ shouldProceedAfterError: (NSDictionary *) errorDict
// Lists of thingies: // Lists of thingies:
val = PrefsFindInt32("keyboardtype"); val = PrefsFindInt32("keyboardtype");
[keyboard selectItemAtIndex: [keyboard indexOfItemWithTag: val]]; tmp = [keyboard indexOfItemWithTag: val];
if ( tmp != -1 )
[keyboard selectItemAtIndex: tmp];
for ( tmp = 0; tmp < [keyboard numberOfItems]; ++tmp ) for ( tmp = 0; tmp < [keyboard numberOfItems]; ++tmp )
{ {
NSMenuItem *type = [keyboard itemAtIndex: tmp]; NSMenuItem *type = [keyboard itemAtIndex: tmp];