X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=cb3d3e87636ad17a88604b28e6d5d6fcec1c38ac;hb=67306fc1d19afd45158b2dc16c1dfbc1bdecb4b7;hp=64001c2306cda8eb1528d182e025d3ad05c8fad4;hpb=8bafdd17133b7db1812f17181f370bbf88bfc6fb;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index 64001c2..cb3d3e8 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -64,6 +64,7 @@ extern char *getenv();
 #endif
 
 
+int initialSquareSize;
 int values[MAX_OPTIONS];
 ChessProgramState *currentCps;
 char manDir[MSG_SIZ] = MANDIR;
@@ -1215,7 +1216,7 @@ static int
 NewTagsCallback (int n)
 {
     if(bookUp) SaveToBook(tagsText), DisplayBook(currentMove); else
-    if(resPtr) { ASSIGN(*resPtr, tagsText); } else
+    if(resPtr) { ASSIGN(*resPtr, tagsText); if(resPtr == &firstChessProgramNames) SaveEngineList(); } else
     ReplaceTags(tagsText, &gameInfo);
     return 1;
 }
@@ -1556,6 +1557,7 @@ EngSel (int n, int sel)
 static void
 LoadEngineProc (int engineNr, char *title)
 {
+   if(*engineListFile) ParseSettingsFile(engineListFile, &engineListFile); // contains engine list
    isUCI = isUSI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults
    secondEng = engineNr;
    if(engineLine)   free(engineLine);   engineLine = strdup("");
@@ -2522,12 +2524,12 @@ DisplayMoveError (String message)
 void
 DisplayFatalError (String message, int error, int status)
 {
-    char buf[MSG_SIZ];
+    char buf[MSG_SIZ], logout = appData.icsActive;
 
     if(status == 666) { // ignore this error when ICS Console window is up
 	if(shellUp[ChatDlg]) return;
 	status = 0;
-    }
+    } else if(status == 6666) status = logout = 0; // 6666 = kludge that indicates ICS connection already closed
 
     errorExitStatus = status;
     if (error == 0) {
@@ -2540,7 +2542,7 @@ DisplayFatalError (String message, int error, int status)
     }
     if(mainOptions[W_BOARD].handle) {
 	if (appData.popupExitMessage) {
-	    if(appData.icsActive) SendToICS("logout\n"); // [HGM] make sure no new games will be started
+	    if(logout) SendToICS("logout\n"); // [HGM] make sure no new games will be started
 	    ErrorPopUp(status ? _("Fatal Error") : _("Exiting"), message, TRUE);
 	} else {
 	    ExitEvent(status);
@@ -3395,3 +3397,11 @@ ActivateTheme (int col)
     DrawPosition(True, NULL);
 }
 
+char *
+Shorten (char *s)
+{
+    static char buf[MSG_SIZ];
+    if(strstr(s, dataDir) != s) return s;
+    snprintf(buf, MSG_SIZ, "~~%s", s + strlen(dataDir));
+    return buf;
+}