summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-06-27 20:21:29 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-14 23:01:49 +0100
commit13248b03593e79948b0621fad9543c239bec0b98 (patch)
tree509863f0b1a2be54af393d28eeed3fa7780ece69 /src
parentf6eb32817537b631d6fb83e26106031d9119fce7 (diff)
Prevent setting of negative trims by changing play length.
Diffstat (limited to 'src')
-rw-r--r--src/wx/timing_panel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 653e44669..4006c5d3e 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -395,7 +395,7 @@ TimingPanel::play_length_changed ()
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
i->set_trim_end (
- ContentTime (i->full_length() - play_length, frc) - i->trim_start ()
+ ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
);
}
}