From 23cbe1f09d3166d46fc41bf074000c2c84596fd9 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 29 Nov 2013 15:47:45 +0000 Subject: [PATCH] CtrlLib: TextCtrl::Load git-svn-id: svn://ultimatepp.org/upp/trunk@6617 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/Text.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uppsrc/CtrlLib/Text.cpp b/uppsrc/CtrlLib/Text.cpp index 511a72a73..23d351600 100644 --- a/uppsrc/CtrlLib/Text.cpp +++ b/uppsrc/CtrlLib/Text.cpp @@ -107,7 +107,7 @@ int TextCtrl::Load(Stream& s, byte charset) { if(c == '\r') cr = true; if(c == '\n') { - if(b8 & 128) { // There are some chars > 127, need to convert + if(charset != CHARSET_UTF8 || (b8 & 128)) { WString w = ToUnicode(~ln, ln.GetCount(), charset); line.Add(w); total += w.GetLength() + 1;