From 9561890c51af705664ae4eeab09e73e978768a0c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 29 Aug 2018 01:24:50 +0100
Subject: [PATCH] Check for unassigned text tracks.

---
 src/lib/film.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 086d12e63..93e7aa1c0 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1644,8 +1644,10 @@ Film::closed_caption_tracks () const
 	list<DCPTextTrack> tt;
 	BOOST_FOREACH (shared_ptr<Content> i, content()) {
 		BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
-			if (j->type() == TEXT_CLOSED_CAPTION && j->dcp_track() && find(tt.begin(), tt.end(), j->dcp_track().get()) == tt.end()) {
-				tt.push_back (j->dcp_track().get());
+			/* XXX: Empty DCPTextTrack ends up being a magic value here */
+			DCPTextTrack dtt = j->dcp_track().get_value_or(DCPTextTrack());
+			if (j->type() == TEXT_CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) {
+				tt.push_back (dtt);
 			}
 		}
 	}
-- 
2.30.2