[FIX] Marlin rendering

makermadecnc · Sep 21, 2020 · 2f3218d · 2f3218d
1 parent 564b0fd
commit 2f3218d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/app/lib/active-state.js b/src/app/lib/active-state.js
@@ -84,8 +84,14 @@ class ActiveState {
         this._modal = _.get(controllerState, this.modalStateKey) || {};
         this._mpos = _.get(controllerState, this.mposKey);
         this._wpos = _.get(controllerState, this.wposKey);
-        this.error = _.get(controllerState, 'status.error');
-        this.alarm = _.get(controllerState, 'status.alarm');
+        if (_.has(controllerState, 'status')) {
+            const status = controllerState.status;
+            this.error = status.error;
+            this.alarm = status.alarm;
+        } else {
+            this.error = null;
+            this.alarm = null;
+        }
     }
 
     get modalStateKey() {

diff --git a/src/app/widgets/Visualizer/Visualizer.jsx b/src/app/widgets/Visualizer/Visualizer.jsx
@@ -858,10 +858,10 @@ class Visualizer extends Component {
 
     // Move the visualizer to the work position
     updateVisualizerPosition() {
-        if (!this.rendered) {
+        const wco = this.wco;
+        if (!this.rendered || !wco) {
             return;
         }
-        const wco = this.wco;
         this.rendered.position.set(wco.x, wco.y, wco.z);
     }