Merge branch 'dev'

cncjs · Jan 8, 2017 · c2ce2a5 · c2ce2a5
2 parents 00d359e + 695c706
commit c2ce2a5
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/web/widgets/Visualizer/index.jsx b/src/web/widgets/Visualizer/index.jsx
@@ -186,18 +186,24 @@ class VisualizerWidget extends Component {
             };
 
             this.setState(nextState, () => {
-                this.visualizer && this.visualizer.load(name, gcode, ({ bbox }) => {
-                    // bounding box
-                    pubsub.publish('gcode:bbox', bbox);
+                if (!capable.view3D) {
+                    return;
+                }
 
-                    this.setState({
-                        gcode: {
-                            ...this.state.gcode,
-                            loading: false,
-                            rendering: false,
-                            ready: true,
-                            bbox: bbox
-                        }
+                delay(0).then(() => {
+                    this.visualizer.load(name, gcode, ({ bbox }) => {
+                        // bounding box
+                        pubsub.publish('gcode:bbox', bbox);
+
+                        this.setState({
+                            gcode: {
+                                ...this.state.gcode,
+                                loading: false,
+                                rendering: false,
+                                ready: true,
+                                bbox: bbox
+                            }
+                        });
                     });
                 });
             });