From 7d33aff2d5e81185f3361e28c84e3f9858464ef1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Feb 2021 14:08:46 +0100 Subject: Coalesce player changes around CPL change. If multiple player changes happen, causing the player to be suspended, there are problems if one of those changes causes a FilmViewer:seek. In there, we wait for the seek to finish, but it will never finish because of the suspension. Hence it's important that we only trigger the seek once the suspension is over. Fixes #1905. --- src/tools/dcpomatic_player.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 6e1104b66..527964953 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -717,8 +717,11 @@ private: --id; } + _viewer->set_coalesce_player_changes (true); dcp->set_cpl ((*i)->id()); examine_content (); + _viewer->set_coalesce_player_changes (false); + _info->triggered_update (); } -- cgit v1.2.3