Commit 4b4d217a authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed crash when reloading simple prefs

parent 33086188
......@@ -23,6 +23,7 @@ Qt Interface:
Mac OS X Interface:
* Added options to disable support for Apple Remote and Media Keys
* More reliable Information and Messages panels
Translations updates for French, Korean, Brazillian, Norwegian Nynorsk
......
......@@ -2,18 +2,28 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>69 70 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2311</key>
<string>345 378 590 293 0 0 1280 778 </string>
<key>2562</key>
<string>151 240 590 453 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>677</string>
<string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>2562</integer>
<integer>2311</integer>
</array>
<key>IBSystem Version</key>
<string>9L25</string>
<string>9L27</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
......
......@@ -2840,7 +2840,7 @@ end:
b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" );
}
/*
- (void)sendEvent: (NSEvent*)event
{
if( b_mediaKeySupport )
......@@ -2889,7 +2889,7 @@ end:
}
}
[super sendEvent: event];
}*/
}
- (void)resetJump
{
......
......@@ -325,9 +325,10 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
}
else if( p_item->ppsz_list[i] )
mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]] action:NULL keyEquivalent: @""];
else NSLog( @"item %d of pref %s failed to be created", i, name);
else
msg_Err( VLCIntf, "item %d of pref %s failed to be created", i, name);
[mi setRepresentedObject:[NSString stringWithUTF8String: p_item->ppsz_list[i]]];
[[object menu] addItem: [mi autorelease]];
[[object menu] addItem: mi];
if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) )
[object selectItem:[object lastItem]];
}
......@@ -747,9 +748,9 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
[[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]];
else
[[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]];
//[[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
// object: nil
// userInfo: nil];
[[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
object: nil
userInfo: nil];
/* okay, let's save our changes to vlcrc */
i = config_SaveConfigFile( p_intf, "main" );
......
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