Merge branch 'master' of https://github.com/gaearon/redux-devtools-lo…

…g-monitor
gaearon · Apr 2, 2016 · 9933313 · 9933313
2 parents 420a1fb + 486381a
commit 9933313
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/LogMonitor.js b/src/LogMonitor.js
@@ -50,7 +50,7 @@ export default class LogMonitor extends Component {
     skippedActionIds: PropTypes.array,
     monitorState: PropTypes.shape({
       initialScrollTop: PropTypes.number
-    }),
+    }).isRequired,
 
     preserveScrollTop: PropTypes.bool,
     select: PropTypes.func.isRequired,
@@ -95,7 +95,7 @@ export default class LogMonitor extends Component {
 
   componentDidMount() {
     const node = this.refs.container;
-    if (!node) {
+    if (!node || !this.props.monitorState) {
       return;
     }