From ff5ed87ed6730b62e037991cbd4a6b5ee43dd7cb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Nov 2023 00:14:32 +0100 Subject: Cleanup: use ScopeGuard. --- src/tools/dcpomatic_player.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 5dd0a0afe..6c6e756ec 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -706,10 +706,12 @@ private: DCPOMATIC_ASSERT (dcp); try { if (dcp) { + ScopeGuard sg([this]() { + _viewer.set_coalesce_player_changes(false); + }); _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())); -- cgit v1.2.3