fix: auto detect console page code

Mythologyli · Jul 20, 2024 · 07520b3 · 07520b3
1 parent 24b5329
commit 07520b3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/utils/utils.cpp b/utils/utils.cpp
@@ -35,12 +35,12 @@ QString Utils::ConsoleOutputToQString(const QByteArray &byteArray)
         QString gbkStr = gbkCodec->toUnicode(byteArray);
         QByteArray gbkByteArrayBack = gbkCodec->fromUnicode(gbkStr);
 
-        if (utf8ByteArrayBack == byteArray || gbkByteArrayBack != byteArray)
+        if (utf8ByteArrayBack == byteArray && gbkByteArrayBack != byteArray)
         {
             codeName = "UTF-8";
             return utf8Str;
         }
-        else if (gbkByteArrayBack == byteArray || utf8ByteArrayBack != byteArray)
+        else if (gbkByteArrayBack == byteArray && utf8ByteArrayBack != byteArray)
         {
             codeName = "GBK";
             return QTextCodec::codecForName("GBK")->toUnicode(byteArray);;