From 590975c2020fea67b06d82af5bec1b798d42ba9b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 7 Oct 2015 17:10:19 +0100 Subject: [PATCH] Better error if no mail server has been configured. --- src/lib/cinema_kdms.cc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index d7190b54d..966955ab4 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -28,6 +28,8 @@ #include #include +#include "i18n.h" + using std::list; using std::string; using boost::shared_ptr; @@ -162,7 +164,7 @@ CinemaKDMs::email (string filename_first_part, string cpl_name, list quickmail_set_body (mail, body.c_str()); quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip"); - char const* error = quickmail_send ( + char const* e = quickmail_send ( mail, Config::instance()->mail_server().c_str(), Config::instance()->mail_port(), @@ -170,12 +172,19 @@ CinemaKDMs::email (string filename_first_part, string cpl_name, list Config::instance()->mail_password().c_str() ); - if (error) { + if (e) { quickmail_destroy (mail); + + string error (e); + + if (Config::instance()->mail_server().empty ()) { + error = _("no mail server set up in preferences"); + } + throw KDMError ( String::compose ( - "Failed to send KDM email to %1 (%2)", - Config::instance()->mail_server(), + _("Failed to send KDM email to %1 (%2)"), + i.cinema->email, error ) ); -- 2.30.2