summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2015-05-25 08:58:32 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2015-05-25 08:58:32 +0200
commit34875413fadda9a5cd11357e87820d9334a4619e (patch)
treea463927c1f8bd511f56e66022b9f4d181e31433b
parent05a75d0a76974bcc1e05cfe6b1403a505c6d8152 (diff)
downloadmpv-34875413fadda9a5cd11357e87820d9334a4619e.tar.bz2
mpv-34875413fadda9a5cd11357e87820d9334a4619e.tar.xz
cocoa: don't load hardcoded icon if running from bundle
Makes ricers happy.
-rw-r--r--video/out/cocoa_common.m3
1 files changed, 3 insertions, 0 deletions
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];