X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=57043bac6f5006a6e1ffcd4457a85147061e3788;hp=ba4d4a49a2b965fbdb60177ad05981c7f95e1635;hb=6f41c52076e60ae7f2b6337b7dc9ea3fa23400e2;hpb=6763f237f2dfe6467cb6308e6735bab6b09d212b

diff --git a/sidebar.c b/sidebar.c
index ba4d4a4..57043ba 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)) {
@@ -209,12 +213,12 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 #if USE_IMAP
   if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && 
       str_len (box) > l)
-    box += l + 1;
+    box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
   else
 #endif
   if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && 
       str_len (box) > l_m)
-    box += l_m + 1;
+    box += l_m;
   else
     box = basename (box);