From 2833670b712776f4d257ac973e32d8c69c7dc740 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sat, 6 Dec 2014 21:54:51 +0100
Subject: cocoa: fix view leak in uninit when fullscreen

---
 video/out/cocoa_common.m | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'video/out/cocoa_common.m')

diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index fb813fd773..14425ef13a 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -208,10 +208,18 @@ void vo_cocoa_uninit(struct vo *vo)
         enable_power_management(vo);
         cocoa_rm_fs_screen_profile_observer(vo);
 
+        // make sure we exit fullscreen before releasing stuff to make sure our
+        // events view retain count actually reaches 0
+        if (!s->embedded)
+            [(MpvEventsView *)s->view setFullScreen:NO];
+
         [s->gl_ctx release];
         [s->view removeFromSuperview];
         [s->view release];
-        if (s->window) [s->window release];
+
+        // if using --wid + libmpv there's no window to release
+        if (s->window)
+            [s->window release];
     });
 }
 
-- 
cgit v1.2.3