From 2852855f19fadb6d7e43282e545a0bcaedc1a3f7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 7 Oct 2015 23:31:07 +0100 Subject: Tweak naming of KDM emails and attachments. --- src/tools/dcpomatic_kdm.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/tools') 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 (new SendKDMEmailJob ( - decrypted.annotation_text(), + film_name, decrypted.content_title_text(), _timing->from(), _timing->until(), CinemaKDMs::collect (screen_kdms) -- cgit v1.2.3