Fixed a rare crash and slightly cleaned the sprefs

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index e82aa20faea331abc2161cbc43501277a0234ccd..3681d3847bcfd14b81608783839fcff05399d38f 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1870,7 +1870,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     vlc_object_kill( p_intf );
 
     /* Go back to Run() and make libvlc exit properly */
-    longjmp( jmpbuffer, 1 );
+    if( jmpbuffer )
+        longjmp( jmpbuffer, 1 );
     /* not reached */
 }
 

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 5fd56bb2798dea61061e7736f7c972f0a0296d2b..64237617ceb9dcc76a68726aa3e3df5f07a1389e 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -105,7 +105,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_sprefs_win setToolbar: o_sprefs_toolbar];
     
     /* setup useful stuff */
-    /* TODO: hard-code this instead of one-the-run generation */
     o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects:
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'],
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'],
@@ -127,7 +126,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'],
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'],
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'],
-                                [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'q'],
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'],
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'],
                                 [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'],
@@ -1151,7 +1149,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( i_returnValue != NSNotFound )
             [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
                                                          _NS("This combination is already taken by \"%@\"."),
-                                                         [self OSXKeyToString:[[o_hotkeyDescriptions objectAtIndex: i_returnValue] intValue]]]];
+                                                         [o_hotkeyDescriptions objectAtIndex: i_returnValue]]];
         else
             [o_hotkeys_change_taken_lbl setStringValue: @""];