Merge pull request scp-fs2open#7407 from Goober5000/fix/coerce_to_utf8

Goober5000 · web-flow · commit f0ed5c88b8a6 · 2026-04-28T22:39:14.000-04:00
fix coerce_to_utf8
diff --git a/code/parse/parselo.cpp b/code/parse/parselo.cpp
@@ -2568,6 +2568,7 @@ void coerce_to_utf8(SCP_string &buffer, const char *str)
 	if (isLatin1)
 	{
 		unicode::convert_encoding(buffer, str, unicode::Encoding::Encoding_iso8859_1, unicode::Encoding::Encoding_utf8);
+		return;
 	}
 
 	// unknown encoding, so just truncate

Original file line number	Diff line number	Diff line change
`@@ -2568,6 +2568,7 @@ void coerce_to_utf8(SCP_string &buffer, const char *str)`
`2568`	`2568`	`if (isLatin1)`
`2569`	`2569`	`{`
`2570`	`2570`	`unicode::convert_encoding(buffer, str, unicode::Encoding::Encoding_iso8859_1, unicode::Encoding::Encoding_utf8);`
	`2571`	`+ return;`
`2571`	`2572`	`}`
`2572`	`2573`
`2573`	`2574`	`// unknown encoding, so just truncate`