changeset 31756:8e043273075d

Change window-closing handling so it works properly if the KEY_CLOSE_WIN is rebound to e.g. skip to next file or not bound at all.
author reimar
date Sun, 25 Jul 2010 14:40:58 +0000
parents d2a29f5447df
children 83423e6b288e
files libvo/vo_corevideo.m
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_corevideo.m	Sun Jul 25 13:53:21 2010 +0000
+++ b/libvo/vo_corevideo.m	Sun Jul 25 14:40:58 2010 +0000
@@ -1032,9 +1032,12 @@
 	return YES;
 }
 
-- (void)windowWillClose:(NSNotification *)aNotification
+- (BOOL)windowShouldClose:(id)sender
 {
-	mpGLView = NULL;
 	mplayer_put_key(KEY_CLOSE_WIN);
+	// We have to wait for MPlayer to handle this,
+	// otherwise we are in trouble if the
+	// KEY_CLOSE_WIN handler is disabled
+	return NO;
 }
 @end