[Commits] [SCM] claws branch, master, updated. 3.15.0-123-g14eb5b0

[ticho at claws-mail.org]

The branch, master has been updated
       via  14eb5b009416465e7ce21523e7f67b78ce9411a8 (commit)
      from  8891eb31b80c60a0231272bee05308d0876ef849 (commit)

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


- Log -----------------------------------------------------------------
commit 14eb5b009416465e7ce21523e7f67b78ce9411a8
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Jul 28 19:46:13 2017 +0200

    Fix template parsing broken by commit 814b087.

diff --git a/src/compose.c b/src/compose.c
index a2b1891..023b36d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3131,9 +3131,6 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
 
 		buf = quote_fmt_get_buffer();
 
-		quote_fmt_reset_vartable();
-		quote_fmtlex_destroy();
-
 		if (buf == NULL)
 			alertpanel_error(_("The \"Quotation mark\" of the template is invalid."));
 		else
@@ -3171,13 +3168,9 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
 		if (buf == NULL) {
 			gint line = quote_fmt_get_line();
 			alertpanel_error(err_msg, line);
-			quote_fmt_reset_vartable();
-			quote_fmtlex_destroy();
 
 			goto error;
 		}
-		quote_fmt_reset_vartable();
-		quote_fmtlex_destroy();
 
 	} else
 		buf = "";
@@ -8846,6 +8839,8 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
 	compose_template_apply_fields(compose, tmpl);
 	compose_attach_from_list(compose, quote_fmt_get_attachments_list(), FALSE);
 	quote_fmt_reset_vartable();
+	quote_fmtlex_destroy();
+
 	compose_changed_cb(NULL, compose);
 
 #ifdef USE_ENCHANT

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


hooks/post-receive
-- 
Claws Mail