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 15a2341848656220acd9f6dc92fbb8c1a8298797..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
@@ -207,9 +207,9 @@ ContentMenu::find_missing ()
                return;
        }
 
-       shared_ptr<Job> j (new ExamineContentJob (film, content, true));
+       shared_ptr<Job> j (new ExamineContentJob (film, content));
        
-       j->Finished.connect (
+       _job_connection = j->Finished.connect (
                bind (
                        &ContentMenu::maybe_found_missing,
                        this,
@@ -231,7 +231,7 @@ ContentMenu::re_examine ()
        }
 
        for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-               film->examine_content (*i, true);
+               film->examine_content (*i);
        }
 }
 
@@ -269,7 +269,7 @@ ContentMenu::kdm ()
                dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
                shared_ptr<Film> film = _film.lock ();
                DCPOMATIC_ASSERT (film);
-               film->examine_content (dcp, true);
+               film->examine_content (dcp);
        }
        
        d->Destroy ();