From 6479ebcd6e8927e58fc308b17d33343fdd8a663b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 25 Feb 2016 23:27:47 +0000
Subject: Don't draw any overlap for audio views.

---
 src/wx/timeline.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index b7f4ec231..ba320bf2f 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -103,7 +103,8 @@ Timeline::paint ()
 		list<dcpomatic::Rect<int> > overlaps;
 		BOOST_FOREACH (shared_ptr<TimelineView> j, _views) {
 			shared_ptr<TimelineContentView> jc = dynamic_pointer_cast<TimelineContentView> (j);
-			if (!ic || !jc || i == j || ic->track() != jc->track() || !ic->active() || !jc->active()) {
+			/* No overlap with non-content views, views no different tracks, audio views or non-active views */
+			if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) {
 				continue;
 			}
 
-- 
cgit v1.2.3