Merge pull request #1578 from mattermost/emitter-leak

Fix emitter leak

1 files changed, 8 insertions, 2 deletions

diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx
index dc23d6792..d0eee5a23 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -280,17 +280,23 @@ export default class PostsView extends React.Component {
             this.updateScrolling();
         }
         window.addEventListener('resize', this.handleResize);
-        PreferenceStore.addChangeListener(this.updateState);
     }
     componentWillUnmount() {
         window.removeEventListener('resize', this.handleResize);
-        PreferenceStore.removeChangeListener(this.updateState);
     }
     componentDidUpdate() {
         if (this.props.postList != null) {
             this.updateScrolling();
         }
     }
+    componentWillReceiveProps(nextProps) {
+        if (!this.props.isActive && nextProps.isActive) {
+            this.updateState();
+            PreferenceStore.addChangeListener(this.updateState);
+        } else if (this.props.isActive && !nextProps.isActive) {
+            PreferenceStore.removeChangeListener(this.updateState);
+        }
+    }
     shouldComponentUpdate(nextProps, nextState) {
         if (this.props.isActive !== nextProps.isActive) {
             return true;