X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=126726440fd22960a903c6d1e85f924e922abbe9;hp=fe1a4709e706568487dccf431c072ae08b12416c;hb=55376219b7cd17c1dc5d8361e969f30e5421e87e;hpb=9b2635634714558cc492d1c31db7c93127369c88

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index fe1a4709..12672644 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -122,7 +122,7 @@ UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options
 { defaultValue = currentValue = (v ? "true" : "false"); }
 
 UCIOption::UCIOption(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f)
-{ defaultValue = currentValue = "false"; }
+{}
 
 UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f)
 { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
@@ -136,16 +136,14 @@ void UCIOption::operator=(const string& v) {
 
   assert(!type.empty());
 
-  if (   !v.empty()
-      && (type == "check" || type == "button") == (v == "true" || v == "false")
-      && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
+  if (   (type == "button" || !v.empty())
+      && (type != "check"  || (v == "true" || v == "false"))
+      && (type != "spin"   || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
   {
-      currentValue = v;
+      if (type != "button")
+          currentValue = v;
 
       if (on_change)
           (*on_change)(*this);
-
-      if (type == "button")
-          currentValue = "false";
   }
 }