From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 Feb 2021 00:42:06 +0000 (+0100)
Subject: Coalesce player changes around KDM loading.
X-Git-Tag: v2.15.129~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e48d176b029a365fb879444c4efe41cfbf075fa7

Coalesce player changes around KDM loading.

A similar fix for KDM changes as 7d33aff2d5e81185f3361e28c84e3f9858464ef1
was for CPL changes.
---

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()));