diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-20 23:12:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-20 23:12:55 +0100 |
| commit | 137f4b5b6ccf7545d0499f57150b005bdfdf5768 (patch) | |
| tree | 9dcea390cc4d88d40eba20b9a88763dfc099aff4 /src/wx/content_menu.cc | |
| parent | 15d7164347404249542dc5ae75cfd37011aef7c3 (diff) | |
| parent | 15235c0d2fad7e916cda5b2d6ce79c4e9a38c4f9 (diff) | |
Merge tag 'v2.16.79' into v2.17.x
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 9c50d56da..92a68e3b3 100644 --- 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)); |