Tweak naming of KDM emails and attachments.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index bc58be914..351c61750 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -50,6 +50,7 @@
 
 using std::exception;
 using std::list;
+using std::string;
 using boost::shared_ptr;
 using boost::bind;
 
@@ -273,8 +274,12 @@ private:
 					wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
 					);
 			} else {
+				string film_name = decrypted.annotation_text ();
+				if (film_name.empty ()) {
+					film_name = decrypted.content_title_text ();
+				}
 				shared_ptr<Job> job (new SendKDMEmailJob (
-							     decrypted.annotation_text(),
+							     film_name,
 							     decrypted.content_title_text(),
 							     _timing->from(), _timing->until(),
 							     CinemaKDMs::collect (screen_kdms)