Skip to content

V
vlc-gpu
Commit cc884078 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed potential race condition 

(cherry picked from commit 5b8a4057)
parent 0e4a59ef
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 24 deletions
modules/gui/macosx/intf.m
View file @ cc884078
...@@ -778,6 +778,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -778,6 +778,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_msg_arr removeAllObjects]; [o_msg_arr removeAllObjects];
[o_msg_arr release]; [o_msg_arr release];
o_msg_arr = NULL;
[o_msg_lock release]; [o_msg_lock release];
...@@ -2000,6 +2001,8 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -2000,6 +2001,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
- (void)processReceivedlibvlcMessage:(const msg_item_t *) item ofType: (int)i_type withStr: (char *)str - (void)processReceivedlibvlcMessage:(const msg_item_t *) item ofType: (int)i_type withStr: (char *)str
{ {
if (o_msg_arr)
{
NSColor *o_white = [NSColor whiteColor]; NSColor *o_white = [NSColor whiteColor];
NSColor *o_red = [NSColor redColor]; NSColor *o_red = [NSColor redColor];
NSColor *o_yellow = [NSColor yellowColor]; NSColor *o_yellow = [NSColor yellowColor];
...@@ -2030,6 +2033,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -2030,6 +2033,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
b_msg_arr_changed = YES; b_msg_arr_changed = YES;
[o_msg_lock unlock]; [o_msg_lock unlock];
}
} }
- (IBAction)saveDebugLog:(id)sender - (IBAction)saveDebugLog:(id)sender
......
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