[vlc-commits] macosx: prevent intermittent crashes on quit by releasing the main window later, since libvlc can try to access it as long as it is alive

Felix Paul Kühne git at videolan.org
Wed Apr 11 22:59:28 CEST 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Apr 11 22:41:58 2012 +0200| [e8b8012d8690d7764f59d804648160c101bae2cb] | committer: Felix Paul Kühne

macosx: prevent intermittent crashes on quit by releasing the main window later, since libvlc can try to access it as long as it is alive
(cherry picked from commit 2ad2a0bd8d9caee51a66e8b0fcd4669f942cbfa0)

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

 modules/gui/macosx/intf.m |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 2e3e859..f6d6232 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -772,8 +772,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_embedded_list release];
     [o_coredialogs release];
     [o_eyetv release];
-    [o_mainwindow release];
-    o_mainwindow = NULL;
 
     /* unsubscribe from libvlc's debug messages */
     vlc_Unsubscribe( p_intf->p_sys->p_sub );
@@ -793,6 +791,9 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     libvlc_Quit( p_intf->p_libvlc );
 
+    [o_mainwindow release];
+    o_mainwindow = NULL;
+
     [self setIntf:nil];
 }
 



More information about the vlc-commits mailing list