From: Carl Hetherington Date: Thu, 7 Jun 2018 08:27:35 +0000 (+0100) Subject: Fix thinko in 5c49ce9. X-Git-Tag: v2.12.8~13 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=54ca9edc8d6cfc6f7175986d5df21bc101663576 Fix thinko in 5c49ce9. --- diff --git a/src/lib/player.cc b/src/lib/player.cc index c94e0b549..7ec8acffa 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -561,7 +561,7 @@ Player::pass () content (but the decoder does not know it yet); check for that and fake it here if necessary. */ - DCPTime const t = content_time_to_dcp (i, min(i->decoder->position(), i->content->trim_start())); + DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start())); if (t > i->content->end()) { i->done = true; } else {