[Commits] [SCM] claws branch, master, updated. 3.17.4-1-gd786e2e

[ticho at claws-mail.org]

The branch, master has been updated
       via  d786e2e9e353d8dd498b4991e41f4f557dcfa66b (commit)
      from  215b6adc8aecb1d81867f144c6d8ed188827fd8d (commit)

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


- Log -----------------------------------------------------------------
commit d786e2e9e353d8dd498b4991e41f4f557dcfa66b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Aug 4 12:20:48 2019 +0200

    Fix a failed assertion in NNTP group list dialog
    
    The code was trying to expand nodes of already subscribed
    newsgroups, even if those newsgroups weren't being displayed
    in the list, usually because of an active search pattern.

diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 429e57e..2314c2f 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -379,11 +379,14 @@ static GtkCMCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
 static void grouplist_expand_upwards(GtkCMCTree *ctree, const gchar *name) {
 	const gchar *ptr;
 	gchar *newname=g_malloc0(strlen(name));
+	GtkCMCTreeNode *node;
 
 	for (ptr=name; *ptr; ptr++) {
-		if (*ptr == '.')
-			gtk_cmctree_expand(ctree, 
-				grouplist_hash_get_branch_node(newname));
+		if (*ptr == '.') {
+			node = grouplist_hash_get_branch_node(newname);
+			if (node != NULL)
+				gtk_cmctree_expand(ctree, node);
+		}
 		newname[ptr-name] = *ptr;
 	}
 	g_free(newname);

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


hooks/post-receive
-- 
Claws Mail