Skip to content

V
vlc
Commit 71b80288 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed a crash 

(cherry picked from commit aff83501)
parent 90172d02
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/gui/macosx/coredialogs.m
View file @ 71b80288
...@@ -165,6 +165,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; ...@@ -165,6 +165,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
{ {
/* we work-around a Cocoa limitation here, since you cannot delay an execution /* we work-around a Cocoa limitation here, since you cannot delay an execution
* on the main thread within a single call */ * on the main thread within a single call */
b_progress_cancelled = NO;
if (VLCIntf) if (VLCIntf)
[self performSelector:@selector(showProgressDialog:) withObject: o_value afterDelay:3.00]; [self performSelector:@selector(showProgressDialog:) withObject: o_value afterDelay:3.00];
} }
...@@ -173,7 +174,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; ...@@ -173,7 +174,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
{ {
dialog_progress_bar_t *p_dialog = [o_value pointerValue]; dialog_progress_bar_t *p_dialog = [o_value pointerValue];
if (!p_dialog) if (!p_dialog || b_progress_cancelled)
return; return;
if( p_dialog->title != NULL ) if( p_dialog->title != NULL )
...@@ -211,6 +212,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; ...@@ -211,6 +212,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
-(void)destroyProgressPanel -(void)destroyProgressPanel
{ {
b_progress_cancelled = YES;
[o_prog_bar stopAnimation: self]; [o_prog_bar stopAnimation: self];
[o_prog_win close]; [o_prog_win close];
} }
......
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