From c45708e75dba23b5ed5ced9d617458ea8bccf868 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 19 Sep 2003 22:35:59 +0000 Subject: [PATCH] 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 --- src/common/strconv.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ) { -- 2.50.0