X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=sidebar.c;h=a9b0788694978a80964dfd9ab4de01f9eeee2cc1;hb=4b2f985c0f88249774e03e9e4111b70f3d8d26dc;hp=bdfcd6dddc346fafc390864ff06bffd0da348359;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258;p=apps%2Fmadmutt.git

diff --git a/sidebar.c b/sidebar.c
index bdfcd6d..a9b0788 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -40,10 +40,14 @@ void calc_boundaries (int menu)
 
   if (list_empty(Incoming))
     return;
+  if (CurBuffy < 0 || CurBuffy >= Incoming->length)
+    CurBuffy = 0;
+  if (TopBuffy < 0 || TopBuffy >= Incoming->length)
+    TopBuffy = 0;
   /* correct known_lines if it has changed because of a window resize */
   /*  if (known_lines != LINES)
     known_lines = LINES; */
-  
+
   lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
   known_lines = lines;
   if (option (OPTSIDEBARNEWMAILONLY)) {
@@ -189,6 +193,7 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 #if USE_IMAP
   int l = str_len (ImapHomeNamespace);
 #endif
+  int l_m = str_len (Maildir);
 
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;
@@ -211,6 +216,10 @@ int make_sidebar_entry (char* box, int idx, size_t len)
     box += l + 1;
   else
 #endif
+  if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && 
+      str_len (box) > l_m)
+    box += l_m + 1;
+  else
     box = basename (box);
 
   if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {