summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-15 01:42:06 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-15 03:16:16 +0100
commite48d176b029a365fb879444c4efe41cfbf075fa7 (patch)
tree246dccee32f802c498b5542c5492d34eb6d9663d
parent80d4e2f514758f8167bfbff984ba1f195bf14eed (diff)
Coalesce player changes around KDM loading.
A similar fix for KDM changes as 7d33aff2d5e81185f3361e28c84e3f9858464ef1 was for CPL changes.
-rw-r--r--src/tools/dcpomatic_player.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 527964953..ea7351157 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -651,8 +651,10 @@ private:
DCPOMATIC_ASSERT (dcp);
try {
if (dcp) {
+ _viewer->set_coalesce_player_changes (true);
dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE)));
examine_content();
+ _viewer->set_coalesce_player_changes (false);
}
} catch (exception& e) {
error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));