From 159bce053932b7306e4fec824cb1e3700b8567ab Mon Sep 17 00:00:00 2001 From: Pritam Ghanghas Date: Mon, 14 Dec 2015 23:32:22 +0530 Subject: [PATCH] Fix for travis falure. Validate min max values before trying to set on metadata --- src/FirmwarePlugin/APM/APMParameterMetaData.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc index 10ca7aebe..967fd1c6e 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc @@ -440,7 +440,7 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType) if (!rawMetaData->min.isEmpty()) { QVariant varMin; QString errorString; - if (metaData->convertAndValidate(rawMetaData->min, true /* convertOnly */, varMin, errorString)) { + if (metaData->convertAndValidate(rawMetaData->min, false /* validate as well */, varMin, errorString)) { metaData->setMin(varMin); } else { qCDebug(APMParameterMetaDataLog) << "Invalid min value, name:" << metaData->name() @@ -452,7 +452,7 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType) if (!rawMetaData->max.isEmpty()) { QVariant varMax; QString errorString; - if (metaData->convertAndValidate(rawMetaData->max, true /* convertOnly */, varMax, errorString)) { + if (metaData->convertAndValidate(rawMetaData->max, false /* validate as well */, varMax, errorString)) { metaData->setMax(varMax); } else { qCDebug(APMParameterMetaDataLog) << "Invalid max value, name:" << metaData->name() << " type:" -- 2.22.0