X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=2d1f3e2730ffacffd1144b79e01fe987065fc36f;hb=refs%2Ftags%2Fv2.14.37;hp=2e1d03b404bc5accc45d35f8ee71e0d487ab4738;hpb=dc864b775198d3378bd77031ad4750bf49e93b6b;p=dcpomatic.git

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 2e1d03b40..2d1f3e273 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -67,14 +67,17 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
 
 		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_close (zip) == -1) {
-		throw runtime_error ("failed to close ZIP archive");
+		int zep;
+		int sep;
+		zip_error_get (zip, &zep, &sep);
+		throw runtime_error (String::compose("failed to close ZIP archive (%1, %2)", zep, sep));
 	}
 }
 
@@ -249,7 +252,7 @@ CinemaKDMs::email (
 		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);