Fix ignore_video checker for separate-3D content (#2246).

1 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 53b173333..f3d78ab32 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -272,17 +272,17 @@ Player::setup_pieces_unlocked ()
 		}
 	}
 
+	auto ignore_overlap = [](shared_ptr<VideoContent> v) {
+		return v && v->use() && v->frame_type() != VideoFrameType::THREE_D_LEFT && v->frame_type() != VideoFrameType::THREE_D_RIGHT;
+	};
+
 	for (auto i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if (auto video = (*i)->content->video) {
-			if (video->use() && video->frame_type() != VideoFrameType::THREE_D_LEFT && video->frame_type() != VideoFrameType::THREE_D_RIGHT) {
-				/* Look for content later in the content list with in-use video that overlaps this */
-				auto period = DCPTimePeriod((*i)->content->position(), (*i)->content->end(_film));
-				auto j = i;
-				++j;
-				for (; j != _pieces.end(); ++j) {
-					if ((*j)->content->video && (*j)->content->video->use()) {
-						(*i)->ignore_video = DCPTimePeriod((*j)->content->position(), (*j)->content->end(_film)).overlap(period);
-					}
+		if (ignore_overlap((*i)->content->video)) {
+			/* Look for content later in the content list with in-use video that overlaps this */
+			auto const period = DCPTimePeriod((*i)->content->position(), (*i)->content->end(_film));
+			for (auto j = std::next(i); j != _pieces.end(); ++j) {
+				if ((*j)->content->video && ignore_overlap((*j)->content->video)) {
+					(*i)->ignore_video = DCPTimePeriod((*j)->content->position(), (*j)->content->end(_film)).overlap(period);
 				}
 			}
 		}