diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
| commit | 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 (patch) | |
| tree | 203675d00d5cc004be6205218f835b6d7a10e925 /src/wx/content_menu.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index c528447ac..15a234184 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -136,7 +136,7 @@ ContentMenu::join () } } - assert (fc.size() > 1); + DCPOMATIC_ASSERT (fc.size() > 1); shared_ptr<Film> film = _film.lock (); if (!film) { @@ -245,8 +245,8 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt shared_ptr<Content> old_content = oc.lock (); shared_ptr<Content> new_content = nc.lock (); - assert (old_content); - assert (new_content); + DCPOMATIC_ASSERT (old_content); + DCPOMATIC_ASSERT (new_content); if (new_content->digest() != old_content->digest()) { error_dialog (0, _("The content file(s) you specified are not the same as those that are missing. Either try again with the correct content file or remove the missing content.")); @@ -259,16 +259,16 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt void ContentMenu::kdm () { - assert (!_content.empty ()); + DCPOMATIC_ASSERT (!_content.empty ()); shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ()); - assert (dcp); + DCPOMATIC_ASSERT (dcp); wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM")); if (d->ShowModal() == wxID_OK) { dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ())))); shared_ptr<Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); film->examine_content (dcp, true); } |