diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-22 03:05:33 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-22 03:05:33 +0000 |
| commit | ade08515539da178e59df7f1af2ad80039f2395a (patch) | |
| tree | 44cb2275b1d5d92e6963f6db734bc1752deb514b | |
| parent | 80084cc18b0f22d0bfebc9f6a1271d352116529e (diff) | |
fix up a little memory mgmt to avoid crashing on OS X 10.5 while setting lang prefs
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6537 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/cocoacarbon.mm | 15 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm index 7747eaec3b..3036eb0ab6 100644 --- a/gtk2_ardour/cocoacarbon.mm +++ b/gtk2_ardour/cocoacarbon.mm @@ -96,9 +96,7 @@ set_language_preference () /* how to get language preferences with CoreFoundation */ - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NSUserDefaults* defs = [NSUserDefaults standardUserDefaults]; - NSArray* languages = [defs objectForKey:@"AppleLanguages"]; + NSArray* languages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"]; /* push into LANGUAGE */ @@ -113,17 +111,10 @@ set_language_preference () } } NSRange r = { 0, count }; - NSString* s = [[languages subarrayWithRange:r] - componentsJoinedByString:@":"]; - cout << "LANGUAGE set to " << [s UTF8String] << endl; - setenv ("LANGUAGE", [s UTF8String], 0); - [s release]; + setenv ("LANGUAGE", [[[languages subarrayWithRange:r] componentsJoinedByString:@":"] UTF8String], 0); + cout << "LANGUAGE set to " << getenv ("LANGUAGE") << endl; } - /* done */ - - [pool release]; - /* now get AppleLocale value and use that for LANG */ CFLocaleRef cflocale = CFLocaleCopyCurrent(); diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index b78c019488..7b5fce1775 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -74,7 +74,7 @@ fixup_bundle_environment () if (!getenv ("ARDOUR_BUNDLED")) { return; } - + set_language_preference (); char execpath[MAXPATHLEN+1]; |