X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bea561cec04633a5810f3166107bd2d0288d4091..b059b79da758fae4c25bd54c85f67a4a0d80f12b:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index f0512af3cc..d9dd83410c 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1402,7 +1402,9 @@ wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
 void wxLocale::DoCommonInit()
 {
   m_pszOldLocale = NULL;
-  m_pOldLocale = NULL;
+
+  m_pOldLocale = wxSetLocale(this);
+
   m_pMsgCat = NULL;
   m_language = wxLANGUAGE_UNKNOWN;
   m_initialized = false;
@@ -1471,9 +1473,6 @@ bool wxLocale::Init(const wxChar *szName,
     }
   }
 
-  // save the old locale to be able to restore it later
-  m_pOldLocale = wxSetLocale(this);
-
   // load the default catalog with wxWidgets standard messages
   m_pMsgCat = NULL;
   bool bOk = true;
@@ -1687,7 +1686,7 @@ bool wxLocale::Init(int language, int flags)
         return false;
     }
 #elif defined(__WXMAC__)
-    if (language == wxLANGUAGE_DEFAULT)
+    if (lang == wxLANGUAGE_DEFAULT)
         locale = wxEmptyString;
     else
         locale = info->CanonicalName;
@@ -2449,9 +2448,8 @@ wxLocale::~wxLocale()
         delete pTmpCat;
     }
 
-    // restore old locale if we had changed it
-    if ( m_pOldLocale )
-        wxSetLocale(m_pOldLocale);
+    // restore old locale pointer
+    wxSetLocale(m_pOldLocale);
 
     // FIXME
 #ifndef __WXWINCE__