Skip to content

V
vlc-2-2
Commit 4c718f0e authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed obscure crash when starting playback while the messages panel is open (fixes #5541)

parent f9c26629
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/gui/macosx/intf.m
View file @ 4c718f0e
...@@ -1852,10 +1852,8 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1852,10 +1852,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
o_enum = [o_msg_arr objectEnumerator]; o_enum = [o_msg_arr objectEnumerator];
while( ( o_msg = [o_enum nextObject] ) != nil ) while( ( o_msg = [o_enum nextObject] ) != NULL )
{
[o_messages insertText: o_msg]; [o_messages insertText: o_msg];
}
b_msg_arr_changed = NO; b_msg_arr_changed = NO;
[o_msg_lock unlock]; [o_msg_lock unlock];
...@@ -1883,7 +1881,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1883,7 +1881,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
[o_msg_arr removeObjectAtIndex: 1]; [o_msg_arr removeObjectAtIndex: 1];
} }
o_attr = [NSDictionary dictionaryWithObject: o_gray forKey: NSForegroundColorAttributeName]; o_attr = [NSDictionary dictionaryWithObject: pp_color[3] forKey: NSForegroundColorAttributeName];
o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s%s", item->psz_module, ppsz_type[i_type]] attributes: o_attr]; o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s%s", item->psz_module, ppsz_type[i_type]] attributes: o_attr];
[o_msg_arr addObject: [o_msg_color autorelease]]; [o_msg_arr addObject: [o_msg_color autorelease]];
......
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