projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5797d31
)
Fix failure to add file-based content in dcpomatic2_create.
author
Carl Hetherington
<cth@carlh.net>
Wed, 28 Jun 2017 12:10:36 +0000
(13:10 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 29 Jun 2017 10:26:56 +0000
(11:26 +0100)
src/tools/dcpomatic_create.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_create.cc
b/src/tools/dcpomatic_create.cc
index 1f9a5b7ec94cf71a027e091a57d9abd1fe36cbe2..7c3ee1308dd02ae6e9a339dd64517978ff55b1a3 100644
(file)
--- a/
src/tools/dcpomatic_create.cc
+++ b/
src/tools/dcpomatic_create.cc
@@
-240,7
+240,10
@@
main (int argc, char* argv[])
list<shared_ptr<Content> > content;
try {
content.push_back (shared_ptr<DCPContent> (new DCPContent (film, can)));
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::DCPReadError) {
+ /* I guess it's not a DCP */
+ content = content_factory (film, can);
+ } catch (boost::filesystem::filesystem_error) {
/* I guess it's not a DCP */
content = content_factory (film, can);
}