Merge branch '1.0' into 1.0-seek

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 254109eb3c882083c52193abf816d8b04d8c871b..b91c82ab154c99e4bb2860bb16e7272888c50992 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -43,9 +43,8 @@ enum {
        ID_remove
 };
 
-ContentMenu::ContentMenu (shared_ptr<Film> f, wxWindow* p)
+ContentMenu::ContentMenu (wxWindow* p)
        : _menu (new wxMenu)
-       , _film (f)
        , _parent (p)
 {
        _repeat = _menu->Append (ID_repeat, _("Repeat..."));
@@ -66,8 +65,9 @@ ContentMenu::~ContentMenu ()
 }
 
 void
-ContentMenu::popup (ContentList c, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> f, ContentList c, wxPoint p)
 {
+       _film = f;
        _content = c;
        _repeat->Enable (!_content.empty ());
 
@@ -80,7 +80,7 @@ ContentMenu::popup (ContentList c, wxPoint p)
        
        _join->Enable (n > 1);
        
-       _find_missing->Enable (_content.size() == 1 && !_content.front()->path_valid ());
+       _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
        _remove->Enable (!_content.empty ());
        _parent->PopupMenu (_menu, p);
 }