Merge tag 'v2.16.79' into v2.17.x

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 9c50d56dab76f49cf2969b44f91de0f59391ce78..92a68e3b3e8df435a644118e2947ac254f10e453 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -520,15 +520,11 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
        DCPOMATIC_ASSERT (dcp);
 
        auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
-       DCPOMATIC_ASSERT (ev.GetId() > 0);
-       DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));
 
-       auto i = cpls.begin ();
-       for (int j = 0; j < ev.GetId() - 1; ++j) {
-               ++i;
-       }
+       DCPOMATIC_ASSERT(ev.GetId() >= DCPOMATIC_CPL_MENU);
+       DCPOMATIC_ASSERT(ev.GetId() < int(DCPOMATIC_CPL_MENU + cpls.size()));
+       dcp->set_cpl(cpls[ev.GetId() - DCPOMATIC_CPL_MENU]->id());
 
-       dcp->set_cpl ((*i)->id ());
        auto film = _film.lock ();
        DCPOMATIC_ASSERT (film);
        JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));