s/destroy_thread/stop_thread/

[dcpomatic.git] / src / lib / cinema_kdms.cc

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index f5d9aef4172705f599680281f6e2c5f98ee32d93..2d1f3e2730ffacffd1144b79e01fe987065fc36f 100644 (file)
--- 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));
        }
 }
 
@@ -206,6 +209,10 @@ CinemaKDMs::email (
 
        BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
 
+               if (i.cinema->emails.empty()) {
+                       continue;
+               }
+
                name_values['c'] = i.cinema->name;
 
                boost::filesystem::path zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
@@ -245,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);