Merge branch 'master' into EvalDir-2020-09-13

2026-07-23 05:07:14 +00:00 · 2020-09-13 17:32:29 +09:00
parent a94a076e39 3ea2d5ef61
commit cdfa71fa8e
3 changed files with 5 additions and 7 deletions
@@ -165,7 +165,7 @@ Option::operator double() const {
 }

 Option::operator std::string() const {
-  assert(type == "string");
+  assert(type == "check" || type == "spin" || type == "combo" || type == "button" || type == "string");
  return currentValue;
 }