X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=c1ae4273af14fc52c5c55bde4704a23d3779f573;hb=92b1e8aaef115278eb3bc6902d76824def8f734a;hp=71d9df5a68c99fa078cb1a99fab2c7ed60bd7312;hpb=53bd2925219894cab67bb12733077e58ff386dc3;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index 71d9df5..c1ae427 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -638,7 +638,7 @@ char *soundNames[] = {
 char *soundFiles[] = { // sound files corresponding to above names
 	"",
 	"$",
-	"*", // kludge alert: as first thing in the dialog readout this is replaced with the user-given .WAV filename
+	NULL, // kludge alert: as first thing in the dialog readout this is replaced with the user-given .WAV filename
 	"honkhonk.wav",
 	"cymbal.wav",
 	"ding1.wav",
@@ -954,7 +954,7 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	if(!n) { DisplayNote(_("Engine has no options")); currentCps = NULL; return 0; }
 	if(n > 50) width = 4; else if(n>24) width = 2; else width = 1;
 	height = n / width + 1;
-	if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = 1; // OK on same line
+	if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = SAME_ROW; // OK on same line
 	currentOption[n].type = EndMark; currentOption[n].target = NULL; // delimit list by callback-less end mark
     }
      i = 0;
@@ -1096,10 +1096,14 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	  case SaveButton:
 	  case Button:
 	    j=0;
-	    XtSetArg(args[j], XtNfromVert, option[i].min & 1 ? lastrow : last);  j++;
+	    if(option[i].min & SAME_ROW) {
+		XtSetArg(args[j], XtNfromVert, lastrow);  j++;
+		XtSetArg(args[j], XtNfromHoriz, last);  j++;
+	    } else {
+		XtSetArg(args[j], XtNfromVert, last);  j++;
+		XtSetArg(args[j], XtNfromHoriz, NULL);  j++; lastrow = forelast;
+	    }
 	    XtSetArg(args[j], XtNlabel, _(option[i].name));  j++;
-	    if(option[i].min & 1) { XtSetArg(args[j], XtNfromHoriz, last);  j++; }
-	    else  { XtSetArg(args[j], XtNfromHoriz, NULL);  j++; lastrow = forelast; }
 	    if(option[i].max) { XtSetArg(args[j], XtNwidth, option[i].max);  j++; }
 	    if(option[i].textValue) { // special for buttons of New Variant dialog
 		XtSetArg(args[j], XtNsensitive, appData.noChessProgram || option[i].value < 0
@@ -1182,7 +1186,7 @@ GenericPopUp(Option *option, char *title, int dlgNr)
     for(h=0; h<height; h++) {
 	i = h + c*height;
 	if(option[i].type == EndMark) break;
-	if(!texts[h]) continue;
+	if(!texts[h]) continue; // Note: texts[h] can be undefined (giving errors in valgrind), but then both if's below will be false.
 	j=0;
 	if(option[i].type == Spin) {
 	    XtSetArg(args[j], XtNwidth, maxWidth);  j++;
@@ -1195,10 +1199,10 @@ GenericPopUp(Option *option, char *title, int dlgNr)
     }
   }
 
-  if(!(option[i].min & 2)) {
+  if(!(option[i].min & NO_OK)) {
     j=0;
-    if(option[i].min & 1) {
-	for(j=i-1; option[j+1].min&1 && option[j].type == Button; j--) {
+    if(option[i].min & SAME_ROW) {
+	for(j=i-1; option[j+1].min & SAME_ROW && option[j].type == Button; j--) {
 	    XtSetArg(args[0], XtNtop, XtChainBottom);
 	    XtSetArg(args[1], XtNbottom, XtChainBottom);
 	    XtSetValues(option[j].handle, args, 2);
@@ -1285,7 +1289,8 @@ void SoundOptionsProc(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
-   soundFiles[2] = "*";
+   free(soundFiles[2]);
+   soundFiles[2] = strdup("*");
    GenericPopUp(soundOptions, _("Sound Options"), 0);
 }