vlc/vlc-2.0 | branch: master | Felix Paul Kühne <[email protected]> | Wed Aug 22 15:25:41 2012 +0200| [11fc0b736ef18397a3e423853972a577b7043d8b] | committer: Felix Paul Kühne
macosx: fixed crash in CoreDialogs when closing the progress panel (cherry picked from commit 52576ea50e1cb5d2fbb3ceba958128dc81ed13b9) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=11fc0b736ef18397a3e423853972a577b7043d8b --- modules/gui/macosx/coredialogs.m | 4 ++-- modules/gui/macosx/intf.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m index a64f018..938c863 100644 --- a/modules/gui/macosx/coredialogs.m +++ b/modules/gui/macosx/coredialogs.m @@ -220,8 +220,8 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; -(void)destroyProgressPanel { b_progress_cancelled = YES; - [o_prog_bar stopAnimation: self]; - [o_prog_win close]; + [o_prog_bar performSelectorOnMainThread:@selector(stopAnimation:) withObject:self waitUntilDone:YES]; + [o_prog_win performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:YES]; } -(IBAction)progDialogAction:(id)sender diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 99b0b46..b2dd0fa 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -449,7 +449,7 @@ void updateProgressPanel (void *priv, const char *text, float value) void destroyProgressPanel (void *priv) { NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; - [[[VLCMain sharedInstance] coreDialogProvider] performSelectorOnMainThread:@selector(destroyProgressPanel) withObject:nil waitUntilDone:NO]; + [[[VLCMain sharedInstance] coreDialogProvider] destroyProgressPanel]; [o_pool release]; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
