From 168c7454487fc81fbbd1ef013ea03f076552f9b2 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 25 Aug 2013 08:18:01 +0000 Subject: [PATCH] ide: Fixed wrong charset issue in console (thanks o_wild) git-svn-id: svn://ultimatepp.org/upp/trunk@6259 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Console.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/uppsrc/ide/Console.cpp b/uppsrc/ide/Console.cpp index ba6a83e88..90221a13c 100644 --- a/uppsrc/ide/Console.cpp +++ b/uppsrc/ide/Console.cpp @@ -55,7 +55,7 @@ void Console::Append(const String& s) { EditPos p = GetEditPos(); SetEditable(); MoveTextEnd(); - WString t = Filter(s, sAppf).ToWString(); + WString t = Filter(FromSystemCharset(s), sAppf).ToWString(); int mg = sb.GetReducedViewSize().cx / GetFont().Info().GetAveWidth(); if(wrap_text && mg > 4) { int x = GetColumnLine(GetCursor()).x; @@ -132,7 +132,6 @@ int Console::Flush() if(slot.outfile) slot.outfile->Put(s); if(!slot.quiet) { - s = FromSystemCharset(s); if(console_lock < 0 || console_lock == i) { console_lock = i; Append(s);