X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=8ce7d90a2c9062a73c44165a3b449667e0feeddd;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hp=4c40c24d3ce2384970e5b12ce39353a84888b655;hpb=6e0f867a69cf4e337370edc986347218afde548e;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 4c40c24d3..8ce7d90a2 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -45,6 +45,7 @@
 #include <stdexcept>
 #include <string>
 
+
 using std::cerr;
 using std::cout;
 using std::dynamic_pointer_cast;
@@ -53,8 +54,10 @@ using std::list;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
+using std::vector;
 using boost::optional;
 
+
 class SimpleSignalManager : public SignalManager
 {
 public:
@@ -117,12 +120,14 @@ main (int argc, char* argv[])
 
 		for (auto cli_content: cc.content) {
 			auto const can = boost::filesystem::canonical (cli_content.path);
-			list<shared_ptr<Content>> film_content_list;
+			vector<shared_ptr<Content>> film_content_list;
 
 			if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
 				auto dcp = make_shared<DCPContent>(can);
 				film_content_list.push_back (dcp);
-				dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
+				if (cli_content.kdm) {
+					dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
+				}
 			} else {
 				/* I guess it's not a DCP */
 				film_content_list = content_factory (can);