parent
711bf39155
commit
24c378da4e
|
@ -68,13 +68,16 @@ static struct string_list *ui_companion_cocoatouch_get_app_icons(void)
|
||||||
attr.i = 0;
|
attr.i = 0;
|
||||||
NSDictionary *iconfiles = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIcons"];
|
NSDictionary *iconfiles = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIcons"];
|
||||||
NSString *primary;
|
NSString *primary;
|
||||||
|
const char *cstr;
|
||||||
#if TARGET_OS_TV
|
#if TARGET_OS_TV
|
||||||
primary = iconfiles[@"CFBundlePrimaryIcon"];
|
primary = iconfiles[@"CFBundlePrimaryIcon"];
|
||||||
#else
|
#else
|
||||||
primary = iconfiles[@"CFBundlePrimaryIcon"][@"CFBundleIconName"];
|
primary = iconfiles[@"CFBundlePrimaryIcon"][@"CFBundleIconName"];
|
||||||
#endif
|
#endif
|
||||||
list = string_list_new();
|
list = string_list_new();
|
||||||
string_list_append(list, [primary cStringUsingEncoding:kCFStringEncodingUTF8], attr);
|
cstr = [primary cStringUsingEncoding:kCFStringEncodingUTF8];
|
||||||
|
if (cstr)
|
||||||
|
string_list_append(list, cstr, attr);
|
||||||
|
|
||||||
NSArray<NSString *> *alts;
|
NSArray<NSString *> *alts;
|
||||||
#if TARGET_OS_TV
|
#if TARGET_OS_TV
|
||||||
|
@ -84,7 +87,11 @@ static struct string_list *ui_companion_cocoatouch_get_app_icons(void)
|
||||||
#endif
|
#endif
|
||||||
NSArray<NSString *> *sorted = [alts sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
|
NSArray<NSString *> *sorted = [alts sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
|
||||||
for (NSString *str in sorted)
|
for (NSString *str in sorted)
|
||||||
string_list_append(list, [str cStringUsingEncoding:kCFStringEncodingUTF8], attr);
|
{
|
||||||
|
cstr = [str cStringUsingEncoding:kCFStringEncodingUTF8];
|
||||||
|
if (cstr)
|
||||||
|
string_list_append(list, cstr, attr);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
|
|
Loading…
Reference in New Issue