[vlc-devel] commit: Fixed a rare crash and slightly cleaned the sprefs ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Apr  6 23:01:56 2008 +0200| [17b93949738d48ac6fbe3b609d998ec37772123c]

Fixed a rare crash and slightly cleaned the sprefs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17b93949738d48ac6fbe3b609d998ec37772123c
---

 modules/gui/macosx/intf.m         |    3 ++-
 modules/gui/macosx/simple_prefs.m |    4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index e82aa20..3681d38 100644
--- 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 5fd56bb..6423761 100644
--- 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: @""];