[vlc-commits] macosx: fixed crash on quit

Felix Paul Kühne git at videolan.org
Sat Jul 16 15:48:04 CEST 2011


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jul 16 15:47:50 2011 +0200| [60de20299e487f6c180975912958397af6f08ef4] | committer: Felix Paul Kühne

macosx: fixed crash on quit

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

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

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 3a17fd5..60ed8f0 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -134,7 +134,7 @@ static void Run( intf_thread_t *p_intf )
 
     [NSApp run];
     [[VLCMain sharedInstance] applicationWillTerminate:nil];
-
+    [o_appLock release];
     [o_pool release];
 }
 
@@ -544,8 +544,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     /* release some other objects here, because it isn't sure whether dealloc
      * will be called later on */
-    [o_mainmenu release];
-
     if( o_sprefs )
         [o_sprefs release];
 
@@ -589,6 +587,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* Make sure the Menu doesn't have any references to vlc objects anymore */
     //FIXME: this should be moved to VLCMainMenu
     [o_mainmenu releaseRepresentedObjects:[NSApp mainMenu]];
+    [o_mainmenu release];
 
     /* Kill the playlist, so that it doesn't accept new request
      * such as the play request from vlc.c (we are a blocking interface). */



More information about the vlc-commits mailing list