From 66f00767d767c6b3eac633dd0da4110dcc00084e Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Fri, 4 May 2018 12:41:25 +0200
Subject: [PATCH] Improve value widget data fetching

---
 src/components/widget-value.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/widget-value.js b/src/components/widget-value.js
index 2a5c765..aa056da 100644
--- a/src/components/widget-value.js
+++ b/src/components/widget-value.js
@@ -32,8 +32,15 @@ class WidgetValue extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
+    if (nextProps.simulationModel == null) {
+      this.setState({ value: '' });
+      return;
+    }
+
+    const simulator = nextProps.simulationModel.simulator;
+
     // update value
-    if (nextProps.data == null || nextProps.simulationModel == null || nextProps.data[nextProps.simulationModel.simulator] == null || nextProps.data[nextProps.simulationModel.simulator].output == null || nextProps.data[nextProps.simulationModel.simulator].output.values == null) {
+    if (nextProps.data == null || nextProps.data[simulator] == null || nextProps.data[simulator].output == null || nextProps.data[simulator].output.values == null) {
       this.setState({ value: '' });
       return;
     }
@@ -41,7 +48,7 @@ class WidgetValue extends Component {
     const unit = nextProps.simulationModel.outputMapping[nextProps.widget.signal].type;
     
     // check if value has changed
-    const signal = nextProps.data[nextProps.simulationModel.simulator].output.values[nextProps.widget.signal];
+    const signal = nextProps.data[simulator].output.values[nextProps.widget.signal];
     if (signal != null && this.state.value !== signal[signal.length - 1].y) {
       this.setState({ value: signal[signal.length - 1].y, unit });
     }