X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=72ac93cc75a48716782f2ef57c2df206607a17f5;hb=5192d1ef54f579c9ad4c09db871fe75d7f410dda;hp=52796495379974fa8bdc6d6ce089ce6216c1174f;hpb=7d33aff2d5e81185f3361e28c84e3f9858464ef1;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 527964953..72ac93cc7 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())); @@ -871,11 +873,11 @@ private: return; } - if (uc->state() == UpdateChecker::YES) { + if (uc->state() == UpdateChecker::State::YES) { auto dialog = new UpdateDialog (this, uc->stable (), uc->test ()); dialog->ShowModal (); dialog->Destroy (); - } else if (uc->state() == UpdateChecker::FAILED) { + } else if (uc->state() == UpdateChecker::State::FAILED) { error_dialog (this, _("The DCP-o-matic download server could not be contacted.")); } else { error_dialog (this, _("There are no new versions of DCP-o-matic available."));