summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-12-26 22:26:41 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-12-26 22:26:41 +0100
commitb205e63cdcbbda8011443e7b593b37cf74a23af1 (patch)
treede6f6cc48edff7e647b5bb32bb1c9b43c517ba0e /video
parent2e8b6419bd730fc5fc1575f2a655517b87a0fd5d (diff)
downloadmpv-b205e63cdcbbda8011443e7b593b37cf74a23af1.tar.bz2
mpv-b205e63cdcbbda8011443e7b593b37cf74a23af1.tar.xz
Revert "cocoa: unlock on uninit"
Not sure why but this doesn't seem to be needed anymore. This reverts commit 6ead6aa005f1c78a117bde58e48f106cfd1e9806.
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m4
1 files changed, 1 insertions, 3 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 67436577cf..748673cf15 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -136,7 +136,6 @@ static void vo_cocoa_set_cursor_visibility(struct vo *vo, bool *visible)
void vo_cocoa_uninit(struct vo *vo)
{
- vo_cocoa_set_current_context(vo, false);
dispatch_sync(dispatch_get_main_queue(), ^{
struct vo_cocoa_state *s = vo->cocoa;
enable_power_management(vo);
@@ -450,10 +449,9 @@ void vo_cocoa_set_current_context(struct vo *vo, bool current)
[s->gl_ctx makeCurrentContext];
} else {
- const bool locked = !![NSOpenGLContext currentContext];
[NSOpenGLContext clearCurrentContext];
- if (!s->inside_sync_section && locked)
+ if (!s->inside_sync_section)
[s->lock unlock];
}
}