[Commits] [SCM] claws branch, master, updated. 3.14.1-19-ge7206c0

[claws at claws-mail.org]

The branch, master has been updated
       via  e7206c0db77c92987f659fb91024ae23f512b9aa (commit)
      from  dc84b54f83b90d57f37b901ca69d673a1f8e4706 (commit)

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


- Log -----------------------------------------------------------------
commit e7206c0db77c92987f659fb91024ae23f512b9aa
Author: Paul <paul at claws-mail.org>
Date:   Tue Nov 22 09:52:06 2016 +0000

    don't ignore auto-account selection when forwarding on IMAP and NNTP accounts
    
    patch by Blatinox

diff --git a/src/compose.c b/src/compose.c
index d356f2a..14f81cc 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -11744,9 +11744,6 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo
 	if (msginfo->folder->prefs->enable_default_account)
 		account = account_find_from_id(msginfo->folder->prefs->default_account);
 		
-	if (!account) 
-		account = msginfo->folder->folder->account;
-		
 	if (!account && msginfo->to && prefs_common.forward_account_autosel) {
 		gchar *to;
 		Xstrdup_a(to, msginfo->to, return NULL);
@@ -11773,6 +11770,9 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo
 		        account = account_find_from_address(buf, FALSE);
                 }
 	}
+
+	if (!account)
+		account = msginfo->folder->folder->account;
 	
 	return account;
 }

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


hooks/post-receive
-- 
Claws Mail