summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/content_factory.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 2b17d69e4..911527384 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -96,7 +96,15 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
continue;
}
- if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) {
+ if (!boost::filesystem::is_regular_file(i->path())) {
+ /* Ignore things which aren't files (probably directories) */
+ continue;
+ }
+
+ if (!valid_image_file (i->path())) {
+ /* We have a normal file which isn't an image; assume we are looking
+ at a DCP.
+ */
is_dcp = true;
}