Fix exit popup in tourney mode

[xboard.git] / winboard / wsettings.c

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 86a9417..d628913 100644 (file)
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -326,8 +326,8 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 // read out all controls, and if value is altered, remember it and send it to the engine\r
 {\r
     HANDLE hwndCombo;\r
-    int i, k, new=0, changed=0;\r
-    char **choices, newText[MSG_SIZ], buf[MSG_SIZ];\r
+    int i, k, new=0, changed=0, len;\r
+    char **choices, newText[MSG_SIZ], buf[MSG_SIZ], *text;\r
     BOOL success;\r
 \r
     for(i=0; i<layout; i++) {\r
@@ -346,11 +346,15 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
            case TextBox:\r
            case FileName:\r
            case PathName:\r
-               success = GetDlgItemText( hDlg, 2001+2*i, newText, MSG_SIZ - strlen(optionList[j].name) - 9 );\r
+               if(cps) len = MSG_SIZ - strlen(optionList[j].name) - 9, text = newText;\r
+               else    len = GetWindowTextLength(GetDlgItem(hDlg, 2001+2*i)) + 1, text = (char*) malloc(len);\r
+               success = GetDlgItemText( hDlg, 2001+2*i, text, len );\r
                if(!success) break;\r
                if(!cps) {\r
+                   char *p;\r
                    if(*(char**)optionList[j].target) free(*(char**)optionList[j].target);\r
-                   *(char**)optionList[j].target = strdup(newText);\r
+                   *(char**)optionList[j].target = p = text;\r
+                   while(*p++ = *text++) if(p[-1] == '\r') p--; // crush CR\r
                    break;\r
                }\r
                changed = strcmp(optionList[j].textValue, newText) != 0;\r
@@ -392,10 +396,12 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
     if(!cps && okFunc) ((ButtonCallback*) okFunc)(0);\r
 }\r
 \r
+char *defaultExt[] = { NULL, "pgn", "fen", "exe", "trn", "bin", "log", "ini" };\r
+\r
 LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
 {\r
     char buf[MSG_SIZ];\r
-    int i, j;\r
+    int i, j, ext;\r
 \r
     switch( message )\r
     {\r
@@ -441,7 +447,8 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
                          ofn.hwndOwner = hDlg;\r
                          ofn.hInstance = hInst;\r
                          ofn.lpstrFilter = filter;\r
-                         ofn.nFilterIndex      = 1L + (activeCps ? 0 : activeList[layoutList[(i-2000)/2+1]].max);\r
+                         ofn.nFilterIndex      = 1L + (ext = activeCps ? 0 : activeList[layoutList[(i-2000)/2+1]].max);\r
+                         ofn.lpstrDefExt       = defaultExt[ext];\r
                          ofn.lpstrFile = buf;\r
                          ofn.nMaxFile = sizeof(buf);\r
                          ofn.lpstrTitle = _("Choose File");\r