X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=f64bc7f0649b2135a194b4b3551b7f17372397dd;hb=dc665d20f1fa64bcbecc86a640151b329b6a6ccb;hp=e1ea6648301843085c8e01ca1067df6c8f014b65;hpb=3267bd2d1fc60f18ac2247f84993923d4765b7af;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index e1ea664..f64bc7f 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;
@@ -1452,7 +1452,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
             }
             else if (option[i].type == FileName || option[i].type == PathName) {
                 gtk_table_attach(GTK_TABLE(table), entry, left+1, left+2, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);
-                button = gtk_button_new_with_label ("Browse");
+                button = gtk_button_new_with_label (_("Browse"));
                 gtk_table_attach(GTK_TABLE(table), button, left+2, left+r, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // Browse button does not expand
                 g_signal_connect (button, "clicked", G_CALLBACK (BrowseGTK), (gpointer)(intptr_t) i);
                 option[i].handle = (void*)entry;
@@ -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 || !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;