diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-07 16:06:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-07 16:06:15 +0100 |
| commit | 3cdaafcc94947dc6a7b79c6c4b1647335dff68a2 (patch) | |
| tree | c49f3824437fc7d2fbba275f787b31bcb79ce8f3 | |
| parent | 5f51f0ce475aeff9ca0016473a3567f7ed6a2099 (diff) | |
Fix addition of image sequence directories with dcpomatic2_create.
| -rw-r--r-- | src/tools/dcpomatic_create.cc | 8 |
1 files 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<shared_ptr<Content> > content; - try { + + if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) { content.push_back (shared_ptr<DCPContent> (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); } |
