Merge pull request #23 from Hoikas/fix_to_buffer

Fix `ST::string::to_buffer` always giving latin_1.
zrax · Jun 7, 2022 · 8bcd9bb · 8bcd9bb
2 parents dce5606 + eacce38
commit 8bcd9bb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/include/st_string.h b/include/st_string.h
@@ -1070,8 +1070,8 @@ namespace ST
         {
             if (utf8)
                 result = to_utf8();
-
-            result = to_latin_1(substitute_out_of_range);
+            else
+                result = to_latin_1(substitute_out_of_range);
         }
 
         ST_DEPRECATED_IN_3_0("use to_buffer(char_buffer &, bool, bool) instead")
@@ -1080,8 +1080,8 @@ namespace ST
         {
             if (utf8)
                 result = to_utf8();
-
-            result = to_latin_1(validation == substitute_invalid);
+            else
+                result = to_latin_1(validation == substitute_invalid);
         }
 
         void to_buffer(utf16_buffer &result) const