X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=a5124234bf3e6a0d87cf36676a75979002d1a337;hb=0278ebc80411a20fd23303156285e55ce8d2b0a5;hp=977c0c685b25592e55aaaa09651ff8f889683e57;hpb=9f42d7d28b859796650bda0b7d5900199010948d;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 977c0c6..a512423 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -1,7 +1,8 @@
 /*
  * woptions.c -- Options dialog box routines for WinBoard
  *
- * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -850,7 +851,6 @@ int radioButton[] = {
     -1,
     OPT_VariantShogi,
     -1, // Chu
-    OPT_VariantXiangqi,
     OPT_VariantCourier,
     OPT_VariantGothic,
     OPT_VariantCapablanca,
@@ -865,10 +865,11 @@ int radioButton[] = {
     OPT_VariantGreat,
     -1, // Twilight,
     OPT_VariantMakruk,
-    OPT_VariantASEAN,
     OPT_VariantSChess,
     OPT_VariantGrand,
     OPT_VariantSpartan, // Spartan
+    OPT_VariantXiangqi,
+    OPT_VariantASEAN,
     OPT_VariantLion,
     -2 // sentinel
 };
@@ -2535,6 +2536,7 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     SetDlgItemInt(hDlg, OPT_Stretch, appData.stretch, FALSE);
     CheckDlgButton(hDlg, OPT_Reversed, appData.ignoreColors);
     CheckDlgButton(hDlg, OPT_Mirror, appData.findMirror);
+    SetDlgItemText(hDlg, OPT_Counts,  "");
     switch (appData.searchMode) {
     case 1:
       CheckDlgButton(hDlg, OPT_Exact, TRUE);
@@ -2579,6 +2581,10 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.searchMode = LoadOptionsWhichRadio(hDlg);
       appData.ignoreColors = IsDlgButtonChecked(hDlg, OPT_Reversed);
       appData.findMirror   = IsDlgButtonChecked(hDlg, OPT_Mirror);
+      GetDlgItemText(hDlg, OPT_Counts, buf, MSG_SIZ);
+      appData.minPieces = appData.maxPieces = 0;
+      sscanf(buf, "%d-%d", &appData.minPieces, &appData.maxPieces);
+      if(appData.maxPieces < appData.minPieces) appData.maxPieces = appData.minPieces;
       EndDialog(hDlg, TRUE);
       return TRUE;