ソースを参照

* 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 13 年 前
コミット
eb680bcc5b
1 ファイル変更2 行追加1 行削除
  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_wide2ansi:=iconv_open('UTF-8',unicode_encoding2);
   iconv_ansi2wide:=iconv_open(unicode_encoding2,'UTF-8');
   iconv_ansi2wide:=iconv_open(unicode_encoding2,'UTF-8');
 {$endif}
 {$endif}
-  if assigned(iconvctl) then
+  if assigned(iconvctl) and
+     (iconv_wide2ansi<>iconv_t(-1)) then
   begin
   begin
     transliterate:=1;
     transliterate:=1;
     iconvctl(iconv_wide2ansi,ICONV_SET_TRANSLITERATE,@transliterate);
     iconvctl(iconv_wide2ansi,ICONV_SET_TRANSLITERATE,@transliterate);