[vlc-commits] macosx: fixed crash when terminating while the progress panel is displayed

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Nov 11 16:13:51 2012 +0100| [77c6906f5ce6ae3c7f99bbf7fd081b73aef9896f] | committer: Felix Paul Kühne

macosx: fixed crash when terminating while the progress panel is displayed
(cherry picked from commit 6c62d7475dce83cbc116f4bcc470ee4f9078e6c1)

Conflicts:
	modules/gui/macosx/intf.m

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=77c6906f5ce6ae3c7f99bbf7fd081b73aef9896f
---

 modules/gui/macosx/intf.m |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 097492a..e1d6bbd 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -449,7 +449,10 @@ void updateProgressPanel (void *priv, const char *text, float value)
 void destroyProgressPanel (void *priv)
 {
     NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
-    [[[VLCMain sharedInstance] coreDialogProvider] destroyProgressPanel];
+
+    if ([[NSApplication sharedApplication] isRunning])
+        [[[VLCMain sharedInstance] coreDialogProvider] performSelectorOnMainThread:@selector(destroyProgressPanel) withObject:nil waitUntilDone:YES];
+
     [o_pool release];
 }