modify m_encoding, not m_name, in wxCSConv::CreateConvIfNeeded() if we don't have...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 352e229b50d8f8b0f8eff192f10304ea771ab13e..9d093143fe7f60cade95290da2010884826be7fc 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3505,7 +3505,7 @@ void wxCSConv::CreateConvIfNeeded() const
         if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
         {
 #if wxUSE_INTL
         if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
         {
 #if wxUSE_INTL

-            self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
+            self->m_encoding = wxLocale::GetSystemEncoding();

 #else
             // fallback to some reasonable default:
             self->m_encoding = wxFONTENCODING_ISO8859_1;
 #else
             // fallback to some reasonable default:
             self->m_encoding = wxFONTENCODING_ISO8859_1;