diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-20 15:34:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-20 15:34:24 +0100 |
| commit | 15235c0d2fad7e916cda5b2d6ce79c4e9a38c4f9 (patch) | |
| tree | cbedba7bc60ce537efde126797fe8a5e82c8d6e1 | |
| parent | 026f7e95210cafb6b44a1c207041df085ce92d95 (diff) | |
Tidy up and fix assertion failure when selecting a CPL from the menu.v2.16.79
| -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 4af5a71b7..642457d93 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)); |