Merge remote-tracking branch 'remotes/remi/master' into dev

This commit is contained in:
supermerill 2020-10-05 20:23:56 +02:00
commit c6331e4194

View File

@ -4982,6 +4982,7 @@ std::string FullPrintConfig::validate()
out_of_range = fopt->get_abs_value(1) < optdef->min || fopt->get_abs_value(1) > optdef->max;
break;
}
case coPercents:
case coFloats:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v < optdef->min || v > optdef->max) {
@ -4989,13 +4990,6 @@ std::string FullPrintConfig::validate()
break;
}
break;
case coPercents:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v*0.01 < optdef->min || v * 0.01 > optdef->max) {
out_of_range = true;
break;
}
break;
case coInt:
{
auto *iopt = static_cast<const ConfigOptionInt*>(opt);