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
2003-09-19 22:35:59 +00:00
parent 6a98321125
commit c45708e75d
1 changed files with 2 additions and 2 deletions
--- 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
       )
    {