From a45a98fbb91cb2db3ee749238c204b39be48086c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Jul 2001 15:38:33 +0000
Subject: [PATCH] fix (?) for error in wxCSConv::LoadNow()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/strconv.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 45d3599040..92699a8c3a 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -776,7 +776,8 @@ void wxCSConv::LoadNow()
                 SetName(name);
         }
 
-        m_cset = wxGetCharacterSet(m_name);
+        // wxGetCharacterSet() complains about NULL name
+        m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
         m_deferred = FALSE;
     }
 }
-- 
2.49.0