X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=22aac1efade98fb9e5be2d1dea7da31f41faaf48;hb=6ff6104ef891b0a81b442f3228c1f4278d23e3e9;hp=a21d487832c3d25f658ec105924947d7495ef904;hpb=580c6c9071703cf3a3923d091c92132f9cf8980a;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index a21d487..22aac1e 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -220,13 +220,13 @@ CreateComboPopup (Widget parent, Option *option, int n)
     int i=0, j;
     Widget menu, entry;
     Arg args[16];
+    char **mb = (char **) option->textValue;
 
+    if(mb[0] == NULL) return; // avoid empty menus, as they cause crash
     menu = XtCreatePopupShell(option->name, simpleMenuWidgetClass,
 			      parent, NULL, 0);
     j = 0;
     XtSetArg(args[j], XtNwidth, 100);  j++;
-//    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-    char **mb = (char **) option->textValue;
     while (mb[i] != NULL) 
       {
 	if (option->min & NO_GETTEXT)
@@ -1154,9 +1154,19 @@ GenericPopUp (Option *option, char *title, int dlgNr)
 	    break;
 	  case CheckBox:
 	    if(!currentCps) option[i].value = *(Boolean*)option[i].target;
-	    j=0;
+	    j=0; // space holder
 	    XtSetArg(args[j], XtNfromVert, last);  j++;
 	    XtSetArg(args[j], XtNwidth, 10);  j++;
+	    XtSetArg(args[j], XtNheight, textHeight-22);  j++;
+	    XtSetArg(args[j], XtNleft, XtChainLeft); j++;
+	    XtSetArg(args[j], XtNright, XtChainLeft); j++;
+	    XtSetArg(args[j], XtNborderWidth, 0);  j++;
+printf("%d\n",textHeight);
+	    if(textHeight < 24) dialog = last; else
+		dialog = XtCreateManagedWidget(" ", labelWidgetClass, form, args, j);
+	    j=0;
+	    XtSetArg(args[j], XtNfromVert, dialog);  j++;
+	    XtSetArg(args[j], XtNwidth, 10);  j++;
 	    XtSetArg(args[j], XtNheight, 10);  j++;
 	    XtSetArg(args[j], XtNleft, XtChainLeft); j++;
 	    XtSetArg(args[j], XtNright, XtChainLeft); j++;