Skip to content

Commit 1a19e66

Browse files
committed
UTF8 checkbox did not affect
1 parent 239e5ee commit 1a19e66

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

SimpleCom/SimpleCom.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,7 @@ static std::tuple<HANDLE, HANDLE> InitConsole(SimpleCom::SerialSetup& setup) {
5151
ss << "Current code page: " << GetConsoleCP();
5252
SimpleCom::debug::log(ss.str().c_str());
5353

54-
if (setup.GetUseUTF8()) {
55-
CALL_WINAPI_WITH_DEBUGLOG(SetConsoleCP(CP_UTF8), TRUE, __FILE__, __LINE__);
56-
CALL_WINAPI_WITH_DEBUGLOG(SetConsoleOutputCP(CP_UTF8), TRUE, __FILE__, __LINE__);
57-
TStringStream ss2;
58-
ss2 << "Code page changed: " << GetConsoleCP();
59-
SimpleCom::debug::log(ss2.str().c_str());
60-
}
61-
6254
DWORD mode;
63-
6455
HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE);
6556
if (hStdIn == INVALID_HANDLE_VALUE) {
6657
throw SimpleCom::WinAPIException(GetLastError(), _T("GetStdHandle(stdin)"));
@@ -133,6 +124,14 @@ int _tmain(int argc, LPCTSTR argv[])
133124
return -3;
134125
}
135126

127+
if (setup.GetUseUTF8()) {
128+
CALL_WINAPI_WITH_DEBUGLOG(SetConsoleCP(CP_UTF8), TRUE, __FILE__, __LINE__);
129+
CALL_WINAPI_WITH_DEBUGLOG(SetConsoleOutputCP(CP_UTF8), TRUE, __FILE__, __LINE__);
130+
TStringStream ss2;
131+
ss2 << "Code page changed: " << GetConsoleCP();
132+
SimpleCom::debug::log(ss2.str().c_str());
133+
}
134+
136135
try {
137136
while (true) {
138137
SimpleCom::SerialConnection conn(device, &dcb, parent_hwnd, std::get<0>(std_handles), std::get<1>(std_handles), setup.GetUseTTYResizer(), setup.GetLogFile(), setup.IsEnableStdinLogging());

0 commit comments

Comments
 (0)