Fix toolbar buttons connection to redux

OHIFViewer-react/src/FlexboxLayout/ConnectedCornerstoneViewport.js

@@ -5,9 +5,11 @@ import OHIF from 'ohif-core'
 const { setViewportActive } = OHIF.redux.actions;
 
 const mapStateToProps = state => {
+    const activeButton = state.tools.buttons.find(tool => tool.active === true);
+
     return {
         activeViewportIndex: state.viewports.activeViewportIndex,
-        activeTool: state.tools.buttons.find(tool => tool.active === true).command
+        activeTool: activeButton && activeButton.command
     };
 };
 

OHIFViewer-react/src/FlexboxLayout/ConnectedToolbarSection.js

@@ -5,9 +5,11 @@ import OHIF from 'ohif-core'
 const { setToolActive } = OHIF.redux.actions;
 
 const mapStateToProps = state => {
+    const activeButton = state.tools.buttons.find(tool => tool.active === true);
+
     return {
         buttons: state.tools.buttons,
-        activeCommand: state.tools.buttons.find(tool => tool.active === true).command
+        activeCommand: activeButton && activeButton.command
     };
 };
 
@@ -15,7 +17,7 @@ const mapDispatchToProps = dispatch => {
     return {
         setToolActive: tool => {
             console.log(`setViewportActive: ${tool}`);
-            dispatch(setToolActive(tool))
+            dispatch(setToolActive(tool.command))
         }
     };
 };