[Commits] [SCM] claws branch, master, updated. 3.16.0-133-g4836480

[ticho at claws-mail.org]

The branch, master has been updated
       via  4836480cc6a001a7bc71c64b09ab587ca270289d (commit)
      from  e9f610a4f8d1c1ffdcadc14d9cb5373987ac28e4 (commit)

Summary of changes:
 src/compose.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 4836480cc6a001a7bc71c64b09ab587ca270289d
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Apr 13 20:25:37 2018 +0200

    Fix for e9f610a4f for the rare cases the privacy system has no error string ready.

diff --git a/src/compose.c b/src/compose.c
index 4cfa88b..97d53bd 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5218,11 +5218,13 @@ static void _display_queue_error(ComposeQueueResult val)
 			break;
 		case COMPOSE_QUEUE_ERROR_SIGNING_FAILED:
 			alertpanel_error(_("Could not queue message for sending:\n\n"
-						"Signature failed: %s"), privacy_get_error());
+						"Signature failed: %s"),
+					privacy_peek_error() ? privacy_get_error() : _("Unknown error"));
 			break;
 		case COMPOSE_QUEUE_ERROR_ENCRYPT_FAILED:
 			alertpanel_error(_("Could not queue message for sending:\n\n"
-						"Encryption failed: %s"), privacy_get_error());
+						"Encryption failed: %s"),
+					privacy_peek_error() ? privacy_get_error() : _("Unknown error"));
 			break;
 		case COMPOSE_QUEUE_ERROR_CHAR_CONVERSION:
 			alertpanel_error(_("Could not queue message for sending:\n\n"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail