Browse Source

macosx: check type of preference entry before using

pull/104/head
Marvin Scholz 7 years ago
parent
commit
b39f2f1c52
  1. 28
      bin/darwinvlc.m

28
bin/darwinvlc.m

@ -226,21 +226,21 @@ int main(int i_argc, const char *ppsz_argv[])
argv[argc++] = "--no-ignore-config";
argv[argc++] = "--media-library";
/* overwrite system language on Mac */
char *lang = NULL;
CFStringRef language;
language = (CFStringRef)CFPreferencesCopyAppValue(CFSTR("language"),
kCFPreferencesCurrentApplication);
if (language) {
lang = FromCFString(language, kCFStringEncodingUTF8);
if (strncmp( lang, "auto", 4 )) {
char tmp[11];
snprintf(tmp, 11, "LANG=%s", lang);
putenv(tmp);
/* Overwrite system language */
CFPropertyListRef lang_pref = CFPreferencesCopyAppValue(CFSTR("language"),
kCFPreferencesCurrentApplication);
if (lang_pref) {
if (CFGetTypeID(lang_pref) == CFStringGetTypeID()) {
char *lang = FromCFString(lang_pref, kCFStringEncodingUTF8);
if (strncmp(lang, "auto", 4)) {
char tmp[11];
snprintf(tmp, 11, "LANG=%s", lang);
putenv(tmp);
}
free(lang);
}
free(lang);
CFRelease(language);
CFRelease(lang_pref);
}
ppsz_argv++; i_argc--; /* skip executable path */

Loading…
Cancel
Save