Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals...

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 3e3c462b2e6981267283186ae2ecc0566db72210..749337b7518674c03b35ac2451272ebd84c26e12 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -136,7 +136,7 @@ ContentMenu::join ()
                }
        }
 
-       assert (fc.size() > 1);
+       DCPOMATIC_ASSERT (fc.size() > 1);
 
        shared_ptr<Film> film = _film.lock ();
        if (!film) {
@@ -209,7 +209,7 @@ ContentMenu::find_missing ()
 
        shared_ptr<Job> j (new ExamineContentJob (film, content));
        
-       j->Finished.connect (
+       _job_connection = j->Finished.connect (
                bind (
                        &ContentMenu::maybe_found_missing,
                        this,
@@ -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);
        }