AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prevent deadlock in wxCSConv::DoCreate if it fails for wxConvLocal -- ugly but works

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-11-09 12:09:13 +00:00
parent 0e2710a6b9
commit a58d4f4d49
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/strconv.cpp
View File

@ -1417,8 +1417,19 @@ wxMBConv *wxCSConv::DoCreate() const
}
#endif // wxUSE_FONTMAP
wxLogError(_("Cannot convert from the charset '%s'!"),
m_name ? m_name
// NB: This is a hack to prevent deadlock. What could otherwise happen
// in Unicode build: wxConvLocal creation ends up being here
// because of some failure and logs the error. But wxLog will try to
// attach timestamp, for which it will need wxConvLocal (to convert
// time to char* and then wchar_t*), but that fails, tries to log
// error, but wxLog has a (already locked) critical section that
// guards static buffer.
static bool alreadyLoggingError = false;
if (!alreadyLoggingError)
{
alreadyLoggingError = true;
wxLogError(_("Cannot convert from the charset '%s'!"),
m_name ? m_name
:
#if wxUSE_FONTMAP
wxFontMapper::GetEncodingDescription(m_encoding).c_str()
@ -1426,6 +1437,8 @@ wxMBConv *wxCSConv::DoCreate() const
wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
);
alreadyLoggingError = false;
}
return NULL;
}