Commit 2669a94f authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* don't autorelease the application

* make sure the terminate of the super is called

This might fix the CodeTek VirtualDesktop appl. (untested)
parent 8d865e5e
...@@ -59,7 +59,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) ...@@ -59,7 +59,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) ); memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
/* Put Cocoa into multithread mode as soon as possible. /* Put Cocoa into multithread mode as soon as possible.
* http://developer.apple.com/techpubs/macosx/Cocoa/ * http://developer.apple.com/techpubs/macosx/Cocoa/
* TasksAndConcepts/ProgrammingTopics/Multithreading/index.html * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
...@@ -71,10 +71,9 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) ...@@ -71,10 +71,9 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
p_intf->b_play = VLC_TRUE; p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run; p_intf->pf_run = Run;
[[VLCApplication sharedApplication] autorelease]; [VLCApplication sharedApplication];
[NSApp setIntf: p_intf]; [NSApp setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
return( 0 ); return( 0 );
...@@ -211,6 +210,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -211,6 +210,7 @@ static void Run( intf_thread_t *p_intf )
- (void)terminate:(id)sender - (void)terminate:(id)sender
{ {
p_intf->p_vlc->b_die = VLC_TRUE; p_intf->p_vlc->b_die = VLC_TRUE;
[super terminate:sender];
} }
...@@ -1261,6 +1261,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -1261,6 +1261,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
o_msg_lock = nil; o_msg_lock = nil;
} }
[NSApp terminate: nil];
[NSApp stop: nil]; [NSApp stop: nil];
/* write cached user defaults to disk */ /* write cached user defaults to disk */
......
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