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 f26c3285af25c506c3023beb48d34828e4cbb594..b5e8925decc8f748b9780666c1f2f125e9cc84f1 100644 (file)
--- 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
     // 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
        )
     {
 #endif // wxUSE_FONTMAP
        )
     {