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

This commit is contained in:
nodchip
2020-09-13 17:32:29 +09:00
committed by GitHub
3 changed files with 5 additions and 7 deletions

View File

@@ -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;
}