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

Do not delete and create the fallback conversion again when it fails

Browse Source
This commit is contained in:
Pavel Tyunin
2020-09-28 22:11:17 +03:00
parent 1e435d2347
commit bc838b4773
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/convauto.cpp
View File

@@ -307,7 +307,7 @@ wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
// try to convert using the auto-detected encoding // try to convert using the auto-detected encoding
size_t rc = m_conv->ToWChar(dst, dstLen, src, srcLen); size_t rc = m_conv->ToWChar(dst, dstLen, src, srcLen);
if ( rc == wxCONV_FAILED && m_bomType == wxBOM_None ) if ( rc == wxCONV_FAILED && m_bomType == wxBOM_None && !m_ownsConv )
{ {
// we may need more bytes before we can decode the input, don't switch // we may need more bytes before we can decode the input, don't switch
// to the fall-back conversion in this case as it would prevent us from // to the fall-back conversion in this case as it would prevent us from
@@ -320,9 +320,6 @@ wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
// simply tried UTF-8 by default, retry it using the fall-back // simply tried UTF-8 by default, retry it using the fall-back
if ( m_encDefault != wxFONTENCODING_MAX ) if ( m_encDefault != wxFONTENCODING_MAX )
{ {
if ( m_ownsConv )
delete m_conv;
self->m_conv = new wxCSConv(m_encDefault == wxFONTENCODING_DEFAULT self->m_conv = new wxCSConv(m_encDefault == wxFONTENCODING_DEFAULT
? GetFallbackEncoding() ? GetFallbackEncoding()
: m_encDefault); : m_encDefault);