diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-12-02 23:54:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-12-03 21:23:07 +0100 |
| commit | befb56d6c8452cb6600c482de5739913601a110a (patch) | |
| tree | 386ae427970a5d63fa1f463c1aa4dd7c2f643801 /src/lib/kdm_with_metadata.cc | |
| parent | 7d1bbe772c7a14c827600b0740ae0ae0fcf05d5d (diff) | |
Don't redefine a variable.
Diffstat (limited to 'src/lib/kdm_with_metadata.cc')
| -rw-r--r-- | src/lib/kdm_with_metadata.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index 3159b4c72..5af83d9cf 100644 --- a/src/lib/kdm_with_metadata.cc +++ b/src/lib/kdm_with_metadata.cc @@ -240,33 +240,33 @@ email ( } boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2)); - Emailer email (config->kdm_from(), i.front()->emails(), subject, body); + Emailer emailer (config->kdm_from(), i.front()->emails(), subject, body); - for (auto i: config->kdm_cc()) { - email.add_cc (i); + for (auto cc: config->kdm_cc()) { + emailer.add_cc (cc); } if (!config->kdm_bcc().empty()) { - email.add_bcc (config->kdm_bcc()); + emailer.add_bcc (config->kdm_bcc()); } - email.add_attachment (zip_file, container_name_format.get(i.front()->name_values(), ".zip"), "application/zip"); + emailer.add_attachment (zip_file, container_name_format.get(i.front()->name_values(), ".zip"), "application/zip"); try { - email.send (config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password()); + emailer.send (config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password()); } catch (...) { boost::filesystem::remove (zip_file); dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL); - dcpomatic_log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL); + dcpomatic_log->log (emailer.email(), LogEntry::TYPE_DEBUG_EMAIL); dcpomatic_log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL); - dcpomatic_log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL); + dcpomatic_log->log (emailer.notes(), LogEntry::TYPE_DEBUG_EMAIL); throw; } boost::filesystem::remove (zip_file); dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL); - dcpomatic_log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL); + dcpomatic_log->log (emailer.email(), LogEntry::TYPE_DEBUG_EMAIL); dcpomatic_log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL); - dcpomatic_log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL); + dcpomatic_log->log (emailer.notes(), LogEntry::TYPE_DEBUG_EMAIL); } } |