From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 19 Sep 2003 22:35:59 +0000 (+0000)
Subject: fixed bug in wxCSConv(encoding) ctor (which I just added)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c45708e75dba23b5ed5ced9d617458ea8bccf868?ds=inline

fixed bug in wxCSConv(encoding) ctor (which I just added)


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index f26c3285af..b5e8925dec 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -883,8 +883,8 @@ wxGetCharacterSet(const wxChar *name, wxFontEncoding encoding)
     // check for the special case of ASCII charset
     if ( (!name && encoding == wxFONTENCODING_DEFAULT)
 #if wxUSE_FONTMAP
-            || wxFontMapper::Get()->
-                    CharsetToEncoding(name) == wxFONTENCODING_DEFAULT
+            || (name && wxFontMapper::Get()->
+                    CharsetToEncoding(name) == wxFONTENCODING_DEFAULT)
 #endif // wxUSE_FONTMAP
        )
     {