From: Carl Hetherington <cth@carlh.net>
Date: Wed, 13 Oct 2021 19:21:27 +0000 (+0200)
Subject: Don't allow negative trims to be set up via changes to play length (#2105).
X-Git-Tag: v2.15.168
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1e419dedd828490498b501e86e67654461cc9488;ds=sidebyside

Don't allow negative trims to be set up via changes to play length (#2105).
---

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 1f2928e01..31b160542 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -412,9 +412,8 @@ TimingPanel::play_length_changed ()
 	Suspender::Block bl = _film_content_changed_suspender.block ();
 	for (auto i: _parent->selected()) {
 		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
-		i->set_trim_end (
-			ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start()
-			);
+		auto dcp = max(DCPTime(), i->full_length(_parent->film()) - play_length);
+		i->set_trim_end (max(ContentTime(), ContentTime(dcp, frc) - i->trim_start()));
 	}
 }