PR feedback

src/components/views/context_menus/NotificationStateContextMenu.js

@@ -37,14 +37,21 @@ module.exports = React.createClass({
         }
     },
 
+    componentWillMount: function() {
+        this._unmounted = false;
+    },
+
+    componentWillUnmount: function() {
+        this._unmounted = true;
+    },
+
     _save: function(newState) {
         const oldState = this.state.roomNotifState;
         const roomId = this.props.room.roomId;
         var cli = MatrixClientPeg.get();
 
-        if (!cli.isGuest()) {
+        if (cli.isGuest()) return;
-            // Wrapping this in a q promise, as setRoomMutePushRule can return
+
-            // a promise or a value
         this.setState({
             roomNotifState: newState,
         });
@@ -52,6 +59,7 @@ module.exports = React.createClass({
             // delay slightly so that the user can see their state change
             // before closing the menu
             return q.delay(500).then(() => {
+                if (this._unmounted) return;
                 // Close the context menu
                 if (this.props.onFinished) {
                     this.props.onFinished();
@@ -61,11 +69,11 @@ module.exports = React.createClass({
             // TODO: some form of error notification to the user
             // to inform them that their state change failed.
             // For now we at least set the state back
+            if (this._unmounted) return;
             this.setState({
                 roomNotifState: oldState,
             });
         });
-        }
     },
 
     _onClickAlertMe: function() {