[vlc-commits] macosx: removed hacks which could lead to crashes when quitting VLC

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Feb  5 14:11:42 2012 +0100| [ec5729a73831da60daab2a23cac06f4a15b4c75b] | committer: Jean-Baptiste Kempf

macosx: removed hacks which could lead to crashes when quitting VLC
(cherry picked from commit 69e78ded598bf2520c21272774f8b3cf2eca32be)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/macosx/intf.m |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index d1b465c..d7196a4 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -692,7 +692,6 @@ static VLCMain *_o_sharedMainInstance = nil;
         [[NSNotificationCenter defaultCenter] postNotificationName: NSApplicationWillTerminateNotification object: nil];
 
     playlist_t * p_playlist;
-    vout_thread_t * p_vout;
     int returnedValue = 0;
 
     if( !p_intf )
@@ -714,8 +713,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     msg_Dbg( p_intf, "Terminating" );
 
-    /* Make sure the intf object is getting killed */
-    vlc_object_kill( p_intf );
     p_playlist = pl_Get( p_intf );
 
     /* unsubscribe from the interactive dialogues */
@@ -783,9 +780,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     [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). */
-    vlc_object_kill( p_playlist );
     libvlc_Quit( p_intf->p_libvlc );
 
     [self setIntf:nil];