From 06f400b06808e99661fd3ab65a66946797e4f964 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 15 Oct 2019 15:04:58 -0700 Subject: [PATCH] Allow for no default value --- src/FactSystem/SettingsFact.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/FactSystem/SettingsFact.cc b/src/FactSystem/SettingsFact.cc index 1d8f4f58f..e6f79fffd 100644 --- a/src/FactSystem/SettingsFact.cc +++ b/src/FactSystem/SettingsFact.cc @@ -35,16 +35,18 @@ SettingsFact::SettingsFact(QString settingsGroup, FactMetaData* metaData, QObjec _visible = qgcApp()->toolbox()->corePlugin()->adjustSettingMetaData(settingsGroup, *metaData); setMetaData(metaData); - 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); - _rawValue = rawDefaultValue; + 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); + _rawValue = rawDefaultValue; + } } connect(this, &Fact::rawValueChanged, this, &SettingsFact::_rawValueChanged); -- 2.22.0