ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-crash-on-broken-rule' into landing-silo

Browse Source
This commit is contained in:
Jenkins 2018-07-17 16:29:31 +02:00
commit d75a31f6c9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-app-core/rulemanager.cpp
View File

@ -246,7 +246,10 @@ StateEvaluator *RuleManager::parseStateEvaluator(const QVariantMap &stateEvaluat
stateEvaluator->setStateDescriptor(sd); stateEvaluator->setStateDescriptor(sd);
foreach (const QVariant &childEvaluatorVariant, stateEvaluatorMap.value("childEvaluators").toList()) { foreach (const QVariant &childEvaluatorVariant, stateEvaluatorMap.value("childEvaluators").toList()) {
stateEvaluator->childEvaluators()->addStateEvaluator(parseStateEvaluator(childEvaluatorVariant.toMap())); StateEvaluator *stateEvaluator = parseStateEvaluator(childEvaluatorVariant.toMap());
if (stateEvaluator) {
stateEvaluator->childEvaluators()->addStateEvaluator(stateEvaluator);
}
} }
operatorEnum = QMetaEnum::fromType<StateEvaluator::StateOperator>(); operatorEnum = QMetaEnum::fromType<StateEvaluator::StateOperator>();
stateEvaluator->setStateOperator((StateEvaluator::StateOperator)operatorEnum.keyToValue(stateEvaluatorMap.value("operator").toByteArray())); stateEvaluator->setStateOperator((StateEvaluator::StateOperator)operatorEnum.keyToValue(stateEvaluatorMap.value("operator").toByteArray()));