From 465f48fb0c860e7b2604e00008baab887a202c0d Mon Sep 17 00:00:00 2001
From: der richter <der.richter@gmx.de>
Date: Sun, 19 Jan 2020 12:48:40 +0100
Subject: cocoa-cb: don't set App icon when called from bundle

due to the bundle config the icon is set automatically via the bundle
system mechanisms. this also makes it possible to set the icon to a
custom one with the standard macOS copy paste method via the file info
dialogue.

Fixes #6874
---
 video/out/cocoa_cb_common.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index 4be17c061c..54edbefcd3 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -166,7 +166,9 @@ class CocoaCB: NSObject {
     }
 
     func setAppIcon() {
-        if let app = NSApp as? Application {
+        if let app = NSApp as? Application,
+            ProcessInfo.processInfo.environment["MPVBUNDLE"] != "true"
+        {
             NSApp.applicationIconImage = app.getMPVIcon()
         }
     }
-- 
cgit v1.2.3