X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=a4ed7251b48c000bea4330215cb789f21beff5b7;hb=78eb76d6b1b20f48ec92acb3249e733a99178b91;hp=e796d7ffa3c3e805fe5f1b8f76cbbfb52d77cbe6;hpb=268c91aade57484e5e2e4cd72114c8cf49865fc9;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index e796d7f..a4ed725 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -861,7 +861,7 @@ gboolean GenericPopDown(w, resptype, gdata)
     /* cancel pressed */
     {
 	if(dlg == BoardWindow) ExitEvent(0);
-	PopDown(dlg);
+	if(dlg == FatalDlg) ErrorOK(1); else PopDown(dlg);
     }
     shells[dlg] = sh; // restore
     return TRUE;
@@ -1486,7 +1486,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
 		label = frame;
 	    }
             gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1);
-	    if(option[i].target || dlgNr != ErrorDlg &&!strchr(option[i].name, '\n')) { // allow user to specify event handler for button presses
+	    if(option[i].target || dlgNr != ErrorDlg && option[i].name && !strchr(option[i].name, '\n')) { // allow user to specify event handler for button presses
 		button = gtk_event_box_new();
                 gtk_container_add(GTK_CONTAINER(button), label);
 		label = button;