diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-22 18:42:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-22 18:42:46 +0000 |
| commit | ef4cd174472dc1c4694d4451dc60b9292c60666b (patch) | |
| tree | 216d46bad240478d4dd9f289e0b542c2dc76dcbd /src/wx/content_menu.cc | |
| parent | af474db6af17d468b42fbae8bd4c3e80dcfd0588 (diff) | |
Merge still/moving image classes.
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 6183e3444..6a8e5cd4a 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -21,7 +21,7 @@ #include <wx/dirdlg.h> #include "lib/playlist.h" #include "lib/film.h" -#include "lib/moving_image_content.h" +#include "lib/image_content.h" #include "lib/content_factory.h" #include "lib/examine_content_job.h" #include "lib/job_manager.h" @@ -126,11 +126,12 @@ ContentMenu::find_missing () shared_ptr<Content> content; /* XXX: a bit nasty */ - if (dynamic_pointer_cast<MovingImageContent> (_content.front ())) { + shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (_content.front ()); + if (ic && !ic->still ()) { wxDirDialog* d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); int const r = d->ShowModal (); if (r == wxID_OK) { - content.reset (new MovingImageContent (film, boost::filesystem::path (wx_to_std (d->GetPath ())))); + content.reset (new ImageContent (film, boost::filesystem::path (wx_to_std (d->GetPath ())))); } d->Destroy (); } else { |