summaryrefslogtreecommitdiffstats
path: root/libvo/vo_corevideo.m
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-07-25 14:40:58 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:14:46 +0200
commitd612a71f397954ad77e9f05d01302dd002df45c8 (patch)
tree4ea08fd5e75ba9830d7a7ac5a4d859fbd0bf45e8 /libvo/vo_corevideo.m
parent6db1ac87fc40fee2095a12a2482484852ed38a6a (diff)
downloadmpv-d612a71f397954ad77e9f05d01302dd002df45c8.tar.bz2
mpv-d612a71f397954ad77e9f05d01302dd002df45c8.tar.xz
vo_corevideo: change window-closing handling
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31822 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_corevideo.m')
-rw-r--r--libvo/vo_corevideo.m7
1 files changed, 5 insertions, 2 deletions
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index 2e39a71195..218b095079 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -1032,9 +1032,12 @@ static int control(uint32_t request, void *data)
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