X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=00aca121bffae8c9de0ae50e1acba16b247f1438;hb=f2344ce98b5950c7a047c3ee29959ad9f26ae8ae;hp=3aeab42b0a2f90af8ef537cfc799399d37a8ce05;hpb=063e1b1a7d30cacd61529d2e6379c5602b6512ed;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 3aeab42..00aca12 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -1,7 +1,7 @@
 /*
  * woptions.c -- Options dialog box routines for WinBoard
  *
- * Copyright 2000, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -135,6 +135,28 @@ VOID SetLoadOptionEnables(HWND hDlg);
 VOID SetSaveOptionEnables(HWND hDlg);
 VOID SetTimeControlEnables(HWND hDlg);
 
+char *
+InterpretFileName(char *buf, char *homeDir)
+{ // [HGM] file name relative to homeDir. (Taken out of SafeOptionsDialog, because it is generally useful)
+  char *result = NULL;
+  if ((isalpha(buf[0]) && buf[1] == ':') ||
+    (buf[0] == '\\' && buf[1] == '\\')) {
+    return strdup(buf);
+  } else {
+    char buf2[MSG_SIZ], buf3[MSG_SIZ];
+    char *dummy;
+    GetCurrentDirectory(MSG_SIZ, buf3);
+    SetCurrentDirectory(homeDir);
+    if (GetFullPathName(buf, MSG_SIZ, buf2, &dummy)) {
+      result = strdup(buf2);
+    } else {
+      result = strdup(buf);
+    }
+    SetCurrentDirectory(buf3);
+  }
+  return result;
+}
+
 /*---------------------------------------------------------------------------*\
  *
  * General Options Dialog functions
@@ -797,6 +819,7 @@ int radioButton[] = {
     -1, // Twilight,
     OPT_VariantMakruk,
     OPT_VariantSChess,
+    OPT_VariantGrand,
     OPT_VariantSpartan, // Spartan
     -2 // sentinel
 };
@@ -807,7 +830,8 @@ VariantWhichRadio(HWND hDlg)
   int i=0, j;
   while((j = radioButton[i++]) != -2) {
 	if(j == -1) continue; // no menu button
- 	if(IsDlgButtonChecked(hDlg, j)) return (VariantClass) i-1;
+	if(IsDlgButtonChecked(hDlg, j) &&
+	   (appData.noChessProgram || strstr(first.variants, VariantName(i-1)))) return (VariantClass) i-1;
   }
   return gameInfo.variant; // If no button checked, keep old
 }
@@ -2110,7 +2134,7 @@ ParseCommSettings(char *arg, DCB *dcb)
   if (cd->label == NULL) goto cant_parse;
   return;
 cant_parse:
-    ExitArgError(_("Can't parse com port settings"), arg);
+    ExitArgError(_("Can't parse com port settings"), arg, TRUE);
 }
 
 
@@ -2493,7 +2517,7 @@ SaveOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       if (IsDlgButtonChecked(hDlg, OPT_Autosave)) {
 	appData.autoSaveGames = TRUE;
 	if (IsDlgButtonChecked(hDlg, OPT_AVPrompt)) {
-	  appData.saveGameFile = "";
+	  ASSIGN(appData.saveGameFile, ""); // [HGM] make sure value is ALWAYS in allocated memory
 	} else /*if (IsDlgButtonChecked(hDlg, OPT_AVToFile))*/ {
 	  GetDlgItemText(hDlg, OPT_AVFilename, buf, MSG_SIZ);
 	  if (*buf == NULLCHAR) {
@@ -2501,25 +2525,12 @@ SaveOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 		       _("Option Error"), MB_OK|MB_ICONEXCLAMATION);
 	    return FALSE;
 	  }
-	  if ((isalpha(buf[0]) && buf[1] == ':') ||
-	    (buf[0] == '\\' && buf[1] == '\\')) {
-	    appData.saveGameFile = strdup(buf);
-	  } else {
-	    char buf2[MSG_SIZ], buf3[MSG_SIZ];
-	    char *dummy;
-	    GetCurrentDirectory(MSG_SIZ, buf3);
-	    SetCurrentDirectory(installDir);
-	    if (GetFullPathName(buf, MSG_SIZ, buf2, &dummy)) {
-	      appData.saveGameFile = strdup(buf2);
-	    } else {
-	      appData.saveGameFile = strdup(buf);
-	    }
-	    SetCurrentDirectory(buf3);
-	  }
+	  FREE(appData.saveGameFile);
+	  appData.saveGameFile = InterpretFileName(buf, homeDir);
 	}
       } else {
 	appData.autoSaveGames = FALSE;
-	appData.saveGameFile = "";
+	ASSIGN(appData.saveGameFile, "");
       }
       appData.oldSaveStyle = IsDlgButtonChecked(hDlg, OPT_Old);
       appData.saveOutOfBookInfo = IsDlgButtonChecked( hDlg, OPT_OutOfBookInfo );
@@ -2828,7 +2839,7 @@ VOID EnginePlayOptionsPopup(HWND hwnd)
  * UCI Options Dialog functions
  *
 \*---------------------------------------------------------------------------*/
-static BOOL BrowseForFolder( const char * title, char * path )
+BOOL BrowseForFolder( const char * title, char * path )
 {
     BOOL result = FALSE;
     BROWSEINFO bi;