X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=f05e68010c77839ceb076e6529397a18b41c8692;hb=5b68a479424c23874371a9fae8ea0ecd1c0bf8e6;hp=36f7ca6a4cf8b89293f34a4e080d1957fb4e782b;hpb=5654074cc0c4862da48eab55d7793803253dfa9c;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 36f7ca6..f05e680 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4307,12 +4307,11 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     ShowWindow(GetDlgItem(hDlg, PB_Bishop), 
        gameInfo.variant != VariantShogi ?
 	       SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hDlg, IDC_Yes), 
-       gameInfo.variant == VariantShogi ?
-	       SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hDlg, IDC_No), 
-       gameInfo.variant == VariantShogi ?
-	       SW_SHOW : SW_HIDE);
+    if(gameInfo.variant == VariantShogi) {
+        SetDlgItemText(hDlg, PB_Queen, "YES");
+        SetDlgItemText(hDlg, PB_Knight, "NO");
+        SetWindowText(hDlg, "Promote?");
+    }
     ShowWindow(GetDlgItem(hDlg, IDC_Centaur), 
        gameInfo.variant == VariantSuper ?
 	       SW_SHOW : SW_HIDE);
@@ -4828,7 +4827,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
-      if(gameMode != BeginningOfGame) break; // allow menu item to remain enabled for better mode highligting
+      if(gameMode != BeginningOfGame) { // allow menu item to remain enabled for better mode highligting
+        DisplayError(_("You can only start a match from the initial position."), 0); break;
+      }
       matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
       appData.matchGames = appData.defaultMatchGames;
       matchGame = 1;