From 5868571f37812962a893c634c39c08c9e90fe624 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 28 Aug 2013 11:16:41 -0400
Subject: [PATCH] MacOS: fix potential crash due to language preferences

---
 src/arch/ArchHooks/ArchHooks_MacOSX.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/arch/ArchHooks/ArchHooks_MacOSX.cpp b/src/arch/ArchHooks/ArchHooks_MacOSX.cpp
index f5be042d0e..79e74d9be1 100644
--- a/src/arch/ArchHooks/ArchHooks_MacOSX.cpp
+++ b/src/arch/ArchHooks/ArchHooks_MacOSX.cpp
@@ -344,11 +344,9 @@ RString ArchHooks::GetPreferredLanguage()
 		// MacRoman agrees with ASCII in the low-order 7 bits.
 		const char *str = CFStringGetCStringPtr( lang, kCFStringEncodingMacRoman );
 		if( str )
-			ret = str;
+			ret = RString( str, 2 );
 		else
 			LOG->Warn( "Unable to determine system language. Using English." );
-
-		ret = RString( str, 2 );
 	}
 
 	CFRelease( languages );