Minimal fix for issue #961

HoratiuMarginean · HoratiuMarginean · commit 3ad688bab5d0 · 2025-06-13T15:48:28.000+03:00
diff --git a/core/src/qrcode/QREncoder.cpp b/core/src/qrcode/QREncoder.cpp
@@ -483,11 +483,12 @@ static const Version& RecommendVersion(ErrorCorrectionLevel ecLevel, CodecMode m
 EncodeResult Encode(const std::wstring& content, ErrorCorrectionLevel ecLevel, CharacterSet charset, int versionNumber,
 					bool useGs1Format, int maskPattern)
 {
-	bool charsetWasUnknown = charset == CharacterSet::Unknown;
-	if (charsetWasUnknown) {
+	if (charset == CharacterSet::Unknown) {
 		charset = DEFAULT_BYTE_MODE_ENCODING;
 	}
 
+	bool charsetIsDefault = (charset == DEFAULT_BYTE_MODE_ENCODING);
+
 	// Pick an encoding mode appropriate for the content. Note that this will not attempt to use
 	// multiple modes / segments even if that were more efficient. Twould be nice.
 	CodecMode mode = ChooseMode(content, charset);
@@ -497,7 +498,7 @@ EncodeResult Encode(const std::wstring& content, ErrorCorrectionLevel ecLevel, C
 	BitArray headerBits;
 
 	// Append ECI segment if applicable
-	if (mode == CodecMode::BYTE && !charsetWasUnknown) {
+	if (mode == CodecMode::BYTE && !charsetIsDefault) {
 		AppendECI(charset, headerBits);
 	}
 
