Explorar o código

* don't try to set the iconv transliterate property in case the iconv
encoder was not successfully initialised

git-svn-id: trunk@19965 -

Jonas Maebe %!s(int64=13) %!d(string=hai) anos
pai
achega
eb680bcc5b
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      rtl/unix/cwstring.pp

+ 2 - 1
rtl/unix/cwstring.pp

@@ -212,7 +212,8 @@ begin
   iconv_wide2ansi:=iconv_open('UTF-8',unicode_encoding2);
   iconv_ansi2wide:=iconv_open(unicode_encoding2,'UTF-8');
 {$endif}
-  if assigned(iconvctl) then
+  if assigned(iconvctl) and
+     (iconv_wide2ansi<>iconv_t(-1)) then
   begin
     transliterate:=1;
     iconvctl(iconv_wide2ansi,ICONV_SET_TRANSLITERATE,@transliterate);