projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow simple/GL config from the player.
[dcpomatic.git]
/
src
/
lib
/
cinema_kdms.cc
diff --git
a/src/lib/cinema_kdms.cc
b/src/lib/cinema_kdms.cc
index 2e1d03b404bc5accc45d35f8ee71e0d487ab4738..7952b7ab22e3f22e3b75f7bb03ea084791234721 100644
(file)
--- a/
src/lib/cinema_kdms.cc
+++ b/
src/lib/cinema_kdms.cc
@@
-67,7
+67,7
@@
CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
name_values['s'] = i.screen->name;
name_values['i'] = i.kdm.id ();
name_values['s'] = i.screen->name;
name_values['i'] = i.kdm.id ();
- string const name =
name_format.get(name_values, ".xml"
);
+ string const name =
careful_string_filter(name_format.get(name_values, ".xml")
);
if (zip_add (zip, name.c_str(), source) == -1) {
throw runtime_error ("failed to add KDM to ZIP archive");
}
if (zip_add (zip, name.c_str(), source) == -1) {
throw runtime_error ("failed to add KDM to ZIP archive");
}
@@
-249,7
+249,7
@@
CinemaKDMs::email (
Config* c = Config::instance ();
try {
Config* c = Config::instance ();
try {
- email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password());
+ email.send (c->mail_server(), c->mail_port(), c->mail_
protocol(), c->mail_
user(), c->mail_password());
} catch (...) {
boost::filesystem::remove (zip_file);
dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
} catch (...) {
boost::filesystem::remove (zip_file);
dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);