Skip to content

V
vlc-2-2
Commit 60de2029 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed crash on quit

parent 62f348b0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/gui/macosx/intf.m
View file @ 60de2029
...@@ -134,7 +134,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -134,7 +134,7 @@ static void Run( intf_thread_t *p_intf )
[NSApp run]; [NSApp run];
[[VLCMain sharedInstance] applicationWillTerminate:nil]; [[VLCMain sharedInstance] applicationWillTerminate:nil];
[o_appLock release];
[o_pool release]; [o_pool release];
} }
...@@ -544,8 +544,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -544,8 +544,6 @@ static VLCMain *_o_sharedMainInstance = nil;
/* release some other objects here, because it isn't sure whether dealloc /* release some other objects here, because it isn't sure whether dealloc
* will be called later on */ * will be called later on */
[o_mainmenu release];
if( o_sprefs ) if( o_sprefs )
[o_sprefs release]; [o_sprefs release];
...@@ -589,6 +587,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -589,6 +587,7 @@ static VLCMain *_o_sharedMainInstance = nil;
/* Make sure the Menu doesn't have any references to vlc objects anymore */ /* Make sure the Menu doesn't have any references to vlc objects anymore */
//FIXME: this should be moved to VLCMainMenu //FIXME: this should be moved to VLCMainMenu
[o_mainmenu releaseRepresentedObjects:[NSApp mainMenu]]; [o_mainmenu releaseRepresentedObjects:[NSApp mainMenu]];
[o_mainmenu release];
/* Kill the playlist, so that it doesn't accept new request /* Kill the playlist, so that it doesn't accept new request
* such as the play request from vlc.c (we are a blocking interface). */ * such as the play request from vlc.c (we are a blocking interface). */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment