Change sidebar to only match $folder prefix on a $sidebar_divider_char. (closes ...

The reporter had a $spoolfile of ~/Mailbox and a $folder of ~/Mail.
The sidebar was truncating the spoolfile to "ox" because it only
looked at a substring prefix match.

diff --git a/sidebar.c b/sidebar.c
index fb758170c8b63ed17fde1c7a0aca2b01ebe23575..3596fec8299f91bdd38f405f41705a1f636ddf7b 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -661,7 +661,10 @@ static void draw_sidebar (int num_rows, int num_cols, int div_width)
 
     /* check whether Maildir is a prefix of the current folder's path */
     short maildir_is_prefix = 0;
-    if ((mutt_strlen (b->path) > maildirlen) && (mutt_strncmp (Maildir, b->path, maildirlen) == 0))
+    if ((mutt_strlen (b->path) > maildirlen) &&
+        (mutt_strncmp (Maildir, b->path, maildirlen) == 0) &&
+        SidebarDelimChars &&
+        strchr (SidebarDelimChars, b->path[maildirlen]))
       maildir_is_prefix = 1;
 
     /* calculate depth of current folder and generate its display name with indented spaces */