Revert merge up from develop

This commit is contained in:
wmwragg 2016-07-27 14:16:17 +01:00
parent 6d141d1a7b
commit 3df746ef14
7 changed files with 130 additions and 143 deletions

View file

@ -406,14 +406,14 @@ module.exports = React.createClass({
this.props.onFinished();
}
else {
self.setState({ updating: self.state.updating + 1 });
this.setState({ updating: this.state.updating + 1 });
createRoom({
createOpts: {
invite: [this.props.member.userId],
},
}).finally(function() {
self.props.onFinished();
self.setState({ updating: self.state.updating - 1 });
}).finally(() => {
this.props.onFinished();
this.setState({ updating: this.state.updating - 1 });
}).done();
}
},