Commit 17b93949 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Fixed a rare crash and slightly cleaned the sprefs

parent e447803e
...@@ -1870,7 +1870,8 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1870,7 +1870,8 @@ static VLCMain *_o_sharedMainInstance = nil;
vlc_object_kill( p_intf ); vlc_object_kill( p_intf );
/* Go back to Run() and make libvlc exit properly */ /* Go back to Run() and make libvlc exit properly */
longjmp( jmpbuffer, 1 ); if( jmpbuffer )
longjmp( jmpbuffer, 1 );
/* not reached */ /* not reached */
} }
......
...@@ -105,7 +105,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -105,7 +105,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_sprefs_win setToolbar: o_sprefs_toolbar]; [o_sprefs_win setToolbar: o_sprefs_toolbar];
/* setup useful stuff */ /* setup useful stuff */
/* TODO: hard-code this instead of one-the-run generation */
o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects:
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'],
...@@ -127,7 +126,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -127,7 +126,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'q'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'],
...@@ -1151,7 +1149,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -1151,7 +1149,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i_returnValue != NSNotFound ) if( i_returnValue != NSNotFound )
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat: [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."), _NS("This combination is already taken by \"%@\"."),
[self OSXKeyToString:[[o_hotkeyDescriptions objectAtIndex: i_returnValue] intValue]]]]; [o_hotkeyDescriptions objectAtIndex: i_returnValue]]];
else else
[o_hotkeys_change_taken_lbl setStringValue: @""]; [o_hotkeys_change_taken_lbl setStringValue: @""];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment