Commit e56629bb authored by DoinLakeFlyer's avatar DoinLakeFlyer

parent e53d470f
......@@ -37,15 +37,20 @@ SettingsFact::SettingsFact(QString settingsGroup, FactMetaData* metaData, QObjec
if (metaData->defaultValueAvailable()) {
QVariant rawDefaultValue = metaData->rawDefaultValue();
if (_visible) {
QVariant typedValue;
QString errorString;
metaData->convertAndValidateRaw(settings.value(_name, rawDefaultValue), true /* conertOnly */, typedValue, errorString);
_rawValue = typedValue;
} else {
// Setting is not visible, force to default value always
settings.setValue(_name, rawDefaultValue);
if (qgcApp()->runningUnitTests()) {
// Don't use saved settings
_rawValue = rawDefaultValue;
} else {
if (_visible) {
QVariant typedValue;
QString errorString;
metaData->convertAndValidateRaw(settings.value(_name, rawDefaultValue), true /* conertOnly */, typedValue, errorString);
_rawValue = typedValue;
} else {
// Setting is not visible, force to default value always
settings.setValue(_name, rawDefaultValue);
_rawValue = rawDefaultValue;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment