From 6eb9ca615acaa16dcb994637d9dc604b4f3a4a3e Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Fri, 15 Sep 2017 04:41:15 -0400 Subject: [PATCH] Fix #108 fix #109 by evaluating a store's value so that it uses the correct context. --- poincare/src/store.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/poincare/src/store.cpp b/poincare/src/store.cpp index 84b7aefa8..533921598 100644 --- a/poincare/src/store.cpp +++ b/poincare/src/store.cpp @@ -75,7 +75,9 @@ ExpressionLayout * Store::privateCreateLayout(FloatDisplayMode floatDisplayMode, template Evaluation * Store::templatedEvaluate(Context& context, AngleUnit angleUnit) const { - context.setExpressionForSymbolName(m_value, m_symbol); + Evaluation * valueEvaluation = m_value->evaluate(context, angleUnit); + context.setExpressionForSymbolName(valueEvaluation, m_symbol); + delete valueEvaluation; if (context.expressionForSymbol(m_symbol) != nullptr) { return context.expressionForSymbol(m_symbol)->evaluate(context, angleUnit); }