summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2015-01-16 19:24:25 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2015-01-16 19:24:25 +0100
commit730db25b1b17626c9d8f83fbe8e8e2596f0d0c2d (patch)
treef1b2b3e512d8fb25e5212fa41cd55b5f1d67d238
parent918b06c42cda98dd8d6f407956620826bd6be80a (diff)
downloadmpv-730db25b1b17626c9d8f83fbe8e8e2596f0d0c2d.tar.bz2
mpv-730db25b1b17626c9d8f83fbe8e8e2596f0d0c2d.tar.xz
cocoa: don't set application icon in libmpv
-rw-r--r--video/out/cocoa_common.m6
1 files changed, 4 insertions, 2 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index a893d0448a..db36e15c97 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -480,8 +480,10 @@ int vo_cocoa_config_window(struct vo *vo, uint32_t flags, void *gl_ctx)
s->pending_events |= VO_EVENT_RESIZE;
});
- [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
- set_application_icon(NSApp);
+ if (!s->embedded) {
+ [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+ set_application_icon(NSApp);
+ }
return 0;
}