Made MenuController communicate with MainController

[MenuTunes.git] / KeyCombo.m

diff --git a/KeyCombo.m b/KeyCombo.m
index 5248197..409c992 100755 (executable)
--- a/KeyCombo.m
+++ b/KeyCombo.m
@@ -99,7 +99,7 @@
 - (NSString *)userDisplayRep
 {
     if ( ! [self isValid] ) {
-        return @"None";
+        return @"";
     } else {
         return [NSString stringWithFormat: @"%@%@",
             [KeyCombo _stringForModifiers: mModifiers],
@@ -112,7 +112,7 @@
     static long modToChar[4][2] = {
             { cmdKey,  0x23180000 },
             { optionKey,       0x23250000 },
-            { controlKey,      0x005E0000 },
+            { controlKey,      0x23030000 },
             { shiftKey,        0x21e70000 }
     };
     
@@ -185,9 +185,9 @@
     KeyCombo *combo;
     
     if (data) {
-        combo = [[NSUnarchiver unarchiveObjectWithData:data] retain];
+        combo = [NSUnarchiver unarchiveObjectWithData:data];
     } else {
-        combo = [[KeyCombo alloc] init];
+        combo = nil;
     }
     
     return combo;