X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=a143d143392867dad52f8d8ef59fb58223195400;hp=3375b99514921dbb55285d687e31d5786912c62a;hb=5088ef227c399f820df601a328ec85afaa732091;hpb=4a9d00d99a1b6b24a9fcc8eb604dc3812b2782b8

diff --git a/recvattach.c b/recvattach.c
index 3375b99..a143d14 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -17,6 +17,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
@@ -413,21 +417,22 @@ static int mutt_query_save_attachment (FILE *fp, BODY *body, HEADER *hdr, char *
   else
     buf[0] = 0;
 
-  prompt = _("Save to file ('.' for last used folder): ");
+  prompt = _("Save to file ('#' for last used folder): ");
   while (prompt)
   {
-    ret = mutt_get_field (prompt, buf, sizeof (buf), M_FILE | M_CLEAR);
-    if (((ret != 0) && (ret != 2)) || (!buf[0]))
+    ret = mutt_get_field (prompt, buf, sizeof (buf), M_FILE | M_CLEAR | M_LASTFOLDER);
+    if (((ret != 0) && (ret != 2)) || (!buf[0] && ret != 2))
       return -1;
 
     if (ret == 2)
     {
-      strfcpy (buf, LastSaveFolder, sizeof (buf));
-      strcat(buf,body->filename);
+      char tmpbuf[_POSIX_PATH_MAX];
+      snprintf(tmpbuf,sizeof(tmpbuf),"%s%s",LastSaveFolder,buf);
+      strfcpy (buf, tmpbuf, sizeof (buf));
       ret = mutt_get_field (_("Save to file: ")
-                , buf, sizeof (buf), M_FILE | M_CLEAR);
+                , buf, sizeof (buf), M_FILE);
       if ((ret != 0) || (!buf[0]))
-      return -1;
+        return -1;
     }  
     else
     {