From 34875413fadda9a5cd11357e87820d9334a4619e Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Mon, 25 May 2015 08:58:32 +0200
Subject: cocoa: don't load hardcoded icon if running from bundle

Makes ricers happy.
---
 video/out/cocoa_common.m | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'video')

diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 043ad9a217..234e032ab1 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -154,6 +154,9 @@ static const char macosx_icon[] =
 static void set_application_icon(NSApplication *app)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSBundle *bundle = [NSBundle mainBundle];
+    if ([bundle pathForResource:@"icon" ofType:@"icns"])
+        return;
     NSData *icon_data = [NSData dataWithBytesNoCopy:(void *)macosx_icon
                                              length:sizeof(macosx_icon)
                                        freeWhenDone:NO];
-- 
cgit v1.2.3