Changeset 3691:25c190abd7d7 for browser.c

Timestamp:

2004-07-13 22:45:18 (4 years ago)

Author:

TAKAHASHI Tamotsu <ttakah@…>

Branch:

HEAD

Message:

Fix Debian#237426. (Experimental.)

Files:

• browser.c (modified) (1 diff)

browser.c

@@ -945 +945 @@
             if (S_ISDIR (st.st_mode))
             {
-              strfcpy (LastDir, buf, sizeof (LastDir));
               destroy_state (&state);
-              if (examine_directory (menu, &state, LastDir, prefix) == 0)
-              {
-                menu->current = 0; 
-                menu->top = 0; 
-                init_menu (&state, menu, title, sizeof (title), buffy);
-              }
+              if (examine_directory (menu, &state, buf, prefix) == 0)
+                strfcpy (LastDir, buf, sizeof (LastDir));
               else
               {
                 mutt_error _("Error scanning directory.");
-                destroy_state (&state);
-                mutt_menuDestroy (&menu);
-                goto bail;
+                if (examine_directory (menu, &state, LastDir, prefix) == -1)
+                {
+                  mutt_menuDestroy (&menu);
+                  goto bail;
+                }
               }
+              menu->current = 0; 
+              menu->top = 0; 
+              init_menu (&state, menu, title, sizeof (title), buffy);
             }
             else