X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=f39199771fcfd1145501c5708a6ecb1e03a373da;hb=f6e0ba4110818a2785aa480eaa05836b742e9992;hp=d57b5769c18732e931761e39d29d5756f5e9e5c1;hpb=c4709fa28f09b91b7d36c17cce477b7b9b498e6e;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index d57b576..f391997 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -1259,7 +1259,7 @@ NewTagsPopup (char *text, char *msg, char *ttl)
     if(tagsText) free(tagsText); tagsText = strdup(text);
     tagsOptions[0].name = msg;
     MarkMenu("View.Tags", TagsDlg);
-    GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, appData.topLevel);
+    GenericPopUp(tagsOptions + (msg == NULL), title, TagsDlg, BoardWindow, NONMODAL, appData.topLevel);
 }
 
 void
@@ -2491,13 +2491,16 @@ GetHelpText (FILE *f, char *name)
 void
 DisplayHelp (char *name)
 {
-    char buf[MSG_SIZ], *manFile = MANDIR "/man6/xboard.6";
+    char buf[MSG_SIZ], tidy[MSG_SIZ];
     FILE *f;
-    if(currentCps) snprintf(manFile = buf, MSG_SIZ, "/usr/share/man/man6/%s.6", currentCps->program);
-    f = fopen(manFile, "r");
+    if(currentCps) {
+	TidyProgramName(currentCps == &first ? appData.firstChessProgram : appData.secondChessProgram, "localhost", tidy);
+	snprintf(buf, MSG_SIZ, "/usr/local/share/man/man6/%s.6", tidy);
+    } else snprintf(buf, MSG_SIZ, "%s/man6/xboard.6", MANDIR);
+    f = fopen(buf, "r");
     if(!f && currentCps) { // engine manual could be in two places
-	snprintf(buf, MSG_SIZ, "/usr/man/man6/%s.6", currentCps->program);
-	f= fopen(buf, "r");
+	snprintf(buf, MSG_SIZ, "/usr/share/man/man6/%s.6", tidy);
+	f = fopen(buf, "r");
     }
     if(f) {
 	GetHelpText(f, name);