Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed crash when setting locale failed (replaces patch 1093811)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-01-02 23:44:36 +00:00
parent 9a84ce0d31
commit bea561cec0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/intl.cpp
View File

@@ -1402,6 +1402,7 @@ wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
void wxLocale::DoCommonInit() void wxLocale::DoCommonInit()
{ {
m_pszOldLocale = NULL; m_pszOldLocale = NULL;
m_pOldLocale = NULL;
m_pMsgCat = NULL; m_pMsgCat = NULL;
m_language = wxLANGUAGE_UNKNOWN; m_language = wxLANGUAGE_UNKNOWN;
m_initialized = false; m_initialized = false;
@@ -2448,8 +2449,10 @@ wxLocale::~wxLocale()
delete pTmpCat; delete pTmpCat;
} }
// restore old locale // restore old locale if we had changed it
wxSetLocale(m_pOldLocale); if ( m_pOldLocale )
wxSetLocale(m_pOldLocale);
// FIXME // FIXME
#ifndef __WXWINCE__ #ifndef __WXWINCE__
wxSetlocale(LC_ALL, m_pszOldLocale); wxSetlocale(LC_ALL, m_pszOldLocale);