Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

[dcpomatic.git] / src / lib / kdm.cc

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index dd20311afefee83ab331fb9adf0c1b9f5eee11b4..0ded8f2c1589c3ffaa327520145919f9eb6e60ab 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -269,19 +269,23 @@ email_kdms (
                quickmail_set_body (mail, body.c_str());
                quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");
 
-               int const port = Config::instance()->mail_user().empty() ? 25 : 587;
-
                char const* error = quickmail_send (
                        mail,
                        Config::instance()->mail_server().c_str(),
-                       port,
+                       Config::instance()->mail_port(),
                        Config::instance()->mail_user().c_str(),
                        Config::instance()->mail_password().c_str()
                        );
 
                if (error) {
                        quickmail_destroy (mail);
-                       throw KDMError (String::compose ("Failed to send KDM email (%1)", error));
+                       throw KDMError (
+                               String::compose (
+                                       "Failed to send KDM email to %1 (%2)",
+                                       Config::instance()->mail_server(),
+                                       error
+                                       )
+                               );
                }
                quickmail_destroy (mail);
        }