diff --git a/src/config.cpp b/src/config.cpp index ee38d963..283aff7f 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -142,16 +142,19 @@ bool isValidOutput(const Json::Value &config, const std::string &name, std::string comparator = str.substr(0, i); int value = std::stoi(str.substr(i)); - if (dimension == "height" && comparator == "<" && height >= value) { - return false; - } else if (dimension == "height" && comparator == ">" && height <= value) { - return false; - }else if (dimension == "width" && comparator == "<" && width >= value) { - return false; - }else if (dimension == "width" && comparator == ">" && width <= value) { + int comparison_value; + if (dimension == "height") { + comparison_value = height; + } else if (dimension == "weight") { + comparison_value = weight; + } else { + continue; + } + + if ((comparator == "<" && comparison_value >= value) || + (comparator == ">" && comparison_value <= value)) { return false; } - return true; } } return true;