Merge branch 'v4.8.x' into master

[xboard.git] / gtk / xboard.c

diff --git a/gtk/xboard.c b/gtk/xboard.c
index ef35f2a..dbcc9e5 100644 (file)
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -1930,7 +1930,7 @@ void MoveTypeInProc(eventkey)
 
     buf[0]=eventkey->keyval;
     buf[1]='\0';
-    if (eventkey->keyval > 32 && eventkey->keyval < 256)
+    if (eventkey->keyval > 32 && eventkey->keyval < 256 || *buf == 27)
        ConsoleAutoPopUp (buf);
 }
 
@@ -2319,11 +2319,14 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp
   char *cp;
   char curDir[MSG_SIZ];
 
+  StartDir(filter, NULL); // change to start directory for this file type
+
   if(def && *def && def[strlen(def)-1] == '/') {
     getcwd(curDir, MSG_SIZ);
     chdir(def);
   }
 
+
   /* make a copy of the filter string, so that strtok can work with it*/
   cp = strdup(filter);
 
@@ -2396,8 +2399,10 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp
            ASSIGN(*name, filename);
            ScheduleDelayedEvent(DelayedLoad, 50);
         }
+      StartDir(filter, filename);
       g_free (filename);
-    };
+    }
+  else StartDir(filter, "");
 
   gtk_widget_destroy (dialog);
   ModeHighlight();