Fix in sidebar-next functionality

The first item in sidebar was always selected, even if there were no new messages. Now the sidebar-new function works as it should.
karelzak · Sep 9, 2014 · d9026ea · d9026ea
1 parent bc0d2ac
commit d9026ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/functions.h b/functions.h
@@ -302,6 +302,7 @@ const struct binding_t OpPager[] = { /* map: pager */
   { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL},
   { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL},
   { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+  { "sidebar-new", OP_SIDEBAR_NEW, NULL },
   { "sidebar-toggle",	OP_SIDEBAR_TOGGLE, NULL },
 
   { NULL,		0,				NULL }

diff --git a/sidebar.c b/sidebar.c
@@ -537,8 +537,12 @@ void scroll_sidebar(int op, int menu)
 			break;
                 case OP_SIDEBAR_NEW:
                         if ( (tmp = exist_next_new()) == NULL)
-                                CurBuffy = TopBuffy;
-                        else 
+                                tmp = TopBuffy;
+			if ( tmp->msg_unread == 0 ) {
+				CurBuffy = tmp;
+				tmp = exist_next_new();
+			}
+			if ( tmp != NULL )
 				CurBuffy = tmp;
                         break;
 		default: