core: fix display of nicks in nicklist when they are in a group with sub-groups (closes #1079)

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 4b0ab6859..bfd6d8664 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -35,6 +35,7 @@ Improvements::
 
 Bug fixes::
 
+  * core: fix display of nicks in nicklist when they are in a group with sub-groups (issue #1079)
   * core, plugins: check return code of strftime function
   * core: fix cast of time_t (to "long long" instead of "long") (issue #1051)
   * core: call the config hook when options are renamed or removed
diff --git a/src/gui/gui-nicklist.c b/src/gui/gui-nicklist.c
index de067455b..85feaa1bc 100644
--- a/src/gui/gui-nicklist.c
+++ b/src/gui/gui-nicklist.c
@@ -680,6 +680,13 @@ gui_nicklist_get_next_item (struct t_gui_buffer *buffer,
     /* find next group by parents */
     while ((ptr_group = ptr_group->parent))
     {
+        if (ptr_group->nicks)
+        {
+            *group = NULL;
+            *nick = ptr_group->nicks;
+            return;
+        }
+
         if (ptr_group->next_group)
         {
             *group = ptr_group->next_group;