projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80d4e2f
)
Coalesce player changes around KDM loading.
author
Carl Hetherington
<cth@carlh.net>
Mon, 15 Feb 2021 00:42:06 +0000
(
01:42
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 15 Feb 2021 02:16:16 +0000
(
03:16
+0100)
A similar fix for KDM changes as
7d33aff2d5e81185f3361e28c84e3f9858464ef1
was for CPL changes.
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 52796495379974fa8bdc6d6ce089ce6216c1174f..ea73511578397f287c82679ac85ab29b93b2073d 100644
(file)
--- 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()));