summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2015-01-16 19:24:25 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:20 +0900
commita80166f22a69615b58710f29504608ba413e5083 (patch)
tree0ec316da5c56877320d4eb23244a96a091ed1eff
parent126b7c47392159f835f471b35971d63b39da05a7 (diff)
downloadmpv-a80166f22a69615b58710f29504608ba413e5083.tar.bz2
mpv-a80166f22a69615b58710f29504608ba413e5083.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 4d57ea970b..020efb16ad 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -482,8 +482,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;
}