summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-17 02:45:17 +0100
committerwm4 <wm4@nowhere>2015-01-17 02:45:17 +0100
commit78e3821bd5f378047bd497cea0df7594d24a7194 (patch)
tree2d153988565df4f9b5f4e558289d9f07a5d83a99
parenteb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5 (diff)
downloadmpv-78e3821bd5f378047bd497cea0df7594d24a7194.tar.bz2
mpv-78e3821bd5f378047bd497cea0df7594d24a7194.tar.xz
cocoa: fix fullscreen handling
Fixes #1483, if it even compiles.
-rw-r--r--video/out/cocoa_common.m5
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 796a67c832..47f686dbd4 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -581,8 +581,6 @@ static void vo_cocoa_fullscreen(struct vo *vo)
if (s->embedded)
return;
- opts->fullscreen = !opts->fullscreen;
-
vo_cocoa_update_screen_info(vo, NULL);
draw_changes_after_next_frame(vo);
@@ -608,11 +606,14 @@ static void vo_cocoa_control_get_icc_profile(struct vo *vo, void *arg)
int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg)
{
+ struct mp_vo_opts *opts = vo->opts;
+
switch (request) {
case VOCTRL_CHECK_EVENTS:
*events |= vo_cocoa_check_events(vo);
return VO_TRUE;
case VOCTRL_FULLSCREEN:
+ opts->fullscreen = !opts->fullscreen;
return vo_cocoa_fullscreen_sync(vo);
case VOCTRL_ONTOP:
return vo_cocoa_ontop(vo);