projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coalesce player changes around KDM loading.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_player.cc
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) {
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();
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()));
}
} catch (exception& e) {
error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));