UTF8 checkbox did not affect

YaSuenag · Aug 11, 2024 · 1a19e66 · 1a19e66
1 parent 239e5ee
commit 1a19e66
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/SimpleCom/SimpleCom.cpp b/SimpleCom/SimpleCom.cpp
@@ -51,16 +51,7 @@ static std::tuple<HANDLE, HANDLE> InitConsole(SimpleCom::SerialSetup& setup) {
 	ss << "Current code page: " << GetConsoleCP();
 	SimpleCom::debug::log(ss.str().c_str());
 
-	if (setup.GetUseUTF8()) {
-		CALL_WINAPI_WITH_DEBUGLOG(SetConsoleCP(CP_UTF8), TRUE, __FILE__, __LINE__);
-		CALL_WINAPI_WITH_DEBUGLOG(SetConsoleOutputCP(CP_UTF8), TRUE, __FILE__, __LINE__);
-		TStringStream ss2;
-		ss2 << "Code page changed: " << GetConsoleCP();
-		SimpleCom::debug::log(ss2.str().c_str());
-	}
-
 	DWORD mode;
-
 	HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE);
 	if (hStdIn == INVALID_HANDLE_VALUE) {
 		throw SimpleCom::WinAPIException(GetLastError(), _T("GetStdHandle(stdin)"));
@@ -133,6 +124,14 @@ int _tmain(int argc, LPCTSTR argv[])
 		return -3;
 	}
 
+	if (setup.GetUseUTF8()) {
+		CALL_WINAPI_WITH_DEBUGLOG(SetConsoleCP(CP_UTF8), TRUE, __FILE__, __LINE__);
+		CALL_WINAPI_WITH_DEBUGLOG(SetConsoleOutputCP(CP_UTF8), TRUE, __FILE__, __LINE__);
+		TStringStream ss2;
+		ss2 << "Code page changed: " << GetConsoleCP();
+		SimpleCom::debug::log(ss2.str().c_str());
+	}
+
 	try {
 		while (true) {
 			SimpleCom::SerialConnection conn(device, &dcb, parent_hwnd, std::get<0>(std_handles), std::get<1>(std_handles), setup.GetUseTTYResizer(), setup.GetLogFile(), setup.IsEnableStdinLogging());