From 3cdaafcc94947dc6a7b79c6c4b1647335dff68a2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jul 2017 16:06:15 +0100 Subject: Fix addition of image sequence directories with dcpomatic2_create. --- src/tools/dcpomatic_create.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 7c3ee1308..6cf4a9c64 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -238,12 +238,10 @@ main (int argc, char* argv[]) for (int i = optind; i < argc; ++i) { boost::filesystem::path const can = boost::filesystem::canonical (argv[i]); list > content; - try { + + if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) { content.push_back (shared_ptr (new DCPContent (film, can))); - } catch (dcp::DCPReadError) { - /* I guess it's not a DCP */ - content = content_factory (film, can); - } catch (boost::filesystem::filesystem_error) { + } else { /* I guess it's not a DCP */ content = content_factory (film, can); } -- cgit v1.2.3