X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fkdm_with_metadata.cc;h=7dee935c4a0346c2b11b97aee5e2268f87055baf;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=5c1ab0aa6fe2e3b2978073d918dedc35b9664969;hpb=cacb0750b9e6efbefa5ffa33a0df9552db5483db;p=dcpomatic.git

diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc
index 5c1ab0aa6..7dee935c4 100644
--- a/src/lib/kdm_with_metadata.cc
+++ b/src/lib/kdm_with_metadata.cc
@@ -212,6 +212,10 @@ send_emails (
 		throw NetworkError (_("No mail server configured in preferences"));
 	}
 
+	if (config->kdm_from().empty()) {
+		throw NetworkError(_("No KDM from address configured in preferences"));
+	}
+
 	for (auto const& kdms_for_cinema: kdms) {
 
 		auto first = kdms_for_cinema.front();
@@ -246,7 +250,13 @@ send_emails (
 		}
 		boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));
 
-		Emailer email (config->kdm_from(), first->emails(), subject, body);
+		auto emails = first->emails();
+		Emailer email (config->kdm_from(), { emails.front() }, subject, body);
+
+		/* Use CC for the second and subsequent email addresses, so we seem less spammy (#2310) */
+		for (auto cc = std::next(emails.begin()); cc != emails.end(); ++cc) {
+			email.add_cc(*cc);
+		}
 
 		for (auto cc: config->kdm_cc()) {
 			email.add_cc (cc);