talons

commit 1135efc54dcf4a6ec5b39be7cb6d5b0255f30dab
parent beb4906f612a4621b64ec43955ddde35661d43e6
Author: Michael Rasmussen <mir@datanom.net>
Date:   Wed, 17 Mar 2021 00:17:49 +0100

Merge branch 'master' into oauth2

Diffstat:
M
AUTHORS
 | 
2
+-
M
src/gtk/authors.h
 | 
2
+-
M
src/summaryview.c
 | 
3
+++

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -4,6 +4,7 @@ Claws Mail
 	Tristan Chabredier	<wwp@claws-mail.org>
 	Darko Koruga		<darko@users.sourceforge.net>
 	Paul Mangan		<paul@claws-mail.org>
+	Thorsten Maerz		<thorsten@claws-mail.org>
 	Ricardo Mones Lastra 	<ricardo@mones.org>
 	Salvatore De Paolis	<iwkse@claws-mail.org>
 	Michael Rasmussen	<mir@datanom.net>
@@ -20,7 +21,6 @@ Claws Mail
 	Werner Koch		<wk@gnupg.org>
 	Charles Lehner		
 	Colin Leroy-Mira	<colin@colino.net>
-	Thorsten Maerz		<torte@netztorte.de>
 	Pawel Pekala		<cOrn@o2.pl>
 	Leandro A. F. Pereira 	<leandro@linuxmag.com.br>
 	Luke Plant 		<L.Plant.98@cantab.net>
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -4,6 +4,7 @@ static char *TEAM_LIST[] = {
 "Tristan Chabredier <wwp@claws-mail.org>",
 "Darko Koruga <darko@users.sf.net>",
 "Paul Mangan <paul@claws-mail.org>",
+"Thorsten Maerz <thorsten@claws-mail.org>",
 "Ricardo Mones Lastra <ricardo@mones.org>",
 "Salvatore De Paolis <iwkse@claws-mail.org>",
 "Michael Rasmussen <mir@datanom.net>",
@@ -22,7 +23,6 @@ static char *EX_TEAM_LIST[] = {
 "Werner Koch",
 "Charles Lehner",
 "Colin Leroy-Mira",
-"Thorsten Maerz",
 "Paweł Pękala",
 "Leandro A. F. Pereira",
 "Luke Plant",
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -4205,6 +4205,9 @@ void summary_mark_as_read(SummaryView *summaryview)
 	if (summary_is_locked(summaryview))
 		return;
 
+	if (!summaryview->folder_item)
+		return;
+
 	if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection) &&
 	     summaryview->folder_item->total_msgs > 1) &&
 	    !summary_mark_all_read_confirm(TRUE))