Fix #108 fix #109 by evaluating a store's value so that it uses the correct context.

This commit is contained in:
Jacob Young
2017-09-15 04:41:15 -04:00
committed by Ecco
parent 5ffd7cc270
commit 6eb9ca615a

View File

@@ -75,7 +75,9 @@ ExpressionLayout * Store::privateCreateLayout(FloatDisplayMode floatDisplayMode,
template<typename T>
Evaluation<T> * Store::templatedEvaluate(Context& context, AngleUnit angleUnit) const {
context.setExpressionForSymbolName(m_value, m_symbol);
Evaluation<T> * valueEvaluation = m_value->evaluate<T>(context, angleUnit);
context.setExpressionForSymbolName(valueEvaluation, m_symbol);
delete valueEvaluation;
if (context.expressionForSymbol(m_symbol) != nullptr) {
return context.expressionForSymbol(m_symbol)->evaluate<T>(context, angleUnit);
}