Do all text -> HTML conversion for subtitles in the same place.

Previously we would convert > to > then the ampersand to &
resulting in >

1 files changed, 1 insertions, 5 deletions

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index e47098ee9..7bb7d6b45 100644
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -77,11 +77,7 @@ marked_up (list<StringText> subtitles, int target_height, float fade_factor)
 		/* Between 1-65535 inclusive, apparently... */
 		out += "alpha=\"" + dcp::raw_convert<string>(int(floor(fade_factor * 65534)) + 1) + "\" ";
 		out += "color=\"#" + i.colour().to_rgb_string() + "\">";
-
-		string t = i.text();
-		replace_all(t, "&", "&amp;");
-		out += t;
-
+		out += i.text();
 		out += "</span>";
 	}