Allow specification of trusted devices by thumbprint rather than

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 63a5143e8e473adc72a4f52ee010d1bd4c09b736..3d74859dc9e139ec9d97e01386386f1f3a562884 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -55,6 +55,7 @@
 #include "lib/version.h"
 #include "lib/signal_manager.h"
 #include "lib/log.h"
+#include "lib/screen.h"
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/cinema.h"
@@ -480,7 +481,7 @@ private:
                                new_film (d->path(), d->template_name());
                        } catch (boost::filesystem::filesystem_error& e) {
 #ifdef DCPOMATIC_WINDOWS
-                               string bad_chars = "<>:\"/\\|?*";
+                               string bad_chars = "<>:\"/|?*";
                                string const filename = d->path().string();
                                string found_bad_chars;
                                for (size_t i = 0; i < bad_chars.length(); ++i) {
@@ -488,11 +489,12 @@ private:
                                                found_bad_chars += bad_chars[i];
                                        }
                                }
-                               error_dialog (
-                                       this,
-                                       String::compose(_("Could not create folder to store film.  Try removing the %1 characters from your folder name.", found_bad_chars)),
-                                       std_to_wx(e.what())
-                                       );
+                               wxString message = _("Could not create folder to store film.");
+                               if (!found_bad_chars.empty()) {
+                                       message += "  ";
+                                       message += wxString::Format (_("Try removing the %s characters from your folder name."), std_to_wx(found_bad_chars).data());
+                               }
+                               error_dialog (this, message, std_to_wx(e.what()));
 #else
                                error_dialog (this, _("Could not create folder to store film."), std_to_wx(e.what()));
 #endif
@@ -822,7 +824,7 @@ private:
                try {
                        kdm = _film->make_kdm (
                                Config::instance()->decryption_chain()->leaf(),
-                               vector<dcp::Certificate> (),
+                               vector<string>(),
                                d->cpl (),
                                dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
                                dcp::LocalTime ("2112-01-01T01:00:00+00:00"),