From d5edc4dd9ca16e3935a105d3ae22e39f238ab9ec Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Mon, 26 Dec 2011 09:19:37 -0800 Subject: [PATCH] Don't crash if language detection fails, but leave a warning. This should be fixed properly at some point (in particular, it is reported to fail for systems using Czech) --- src/arch/ArchHooks/ArchHooks_MacOSX.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/ArchHooks/ArchHooks_MacOSX.cpp b/src/arch/ArchHooks/ArchHooks_MacOSX.cpp index 2364a9aeaa..bc67e9fca3 100644 --- a/src/arch/ArchHooks/ArchHooks_MacOSX.cpp +++ b/src/arch/ArchHooks/ArchHooks_MacOSX.cpp @@ -343,7 +343,11 @@ RString ArchHooks::GetPreferredLanguage() { // MacRoman agrees with ASCII in the low-order 7 bits. const char *str = CFStringGetCStringPtr( lang, kCFStringEncodingMacRoman ); - ASSERT( str ); + if( str ) + ret = str; + else + LOG->Warn( "Unable to determine system language. Using English." ); + ret = RString( str, 2 ); }