Fix potential race in setting client listeners

pull/21833/head
David Baker 2017-06-23 10:48:21 +01:00
parent ae053e88c7
commit 8f3eb89f8b
1 changed files with 6 additions and 5 deletions

View File

@ -548,7 +548,12 @@ module.exports = React.createClass({
this._onLoggedOut(); this._onLoggedOut();
break; break;
case 'will_start_client': case 'will_start_client':
this._onWillStartClient(); this.setState({ready: false}, () => {
// if the client is about to start, we are, by definition, not ready.
// Set ready to false now, then it'll be set to true when the sync
// listener we set below fires.
this._onWillStartClient();
});
break; break;
case 'new_version': case 'new_version':
this.onVersion( this.onVersion(
@ -1012,10 +1017,6 @@ module.exports = React.createClass({
*/ */
_onWillStartClient() { _onWillStartClient() {
const self = this; const self = this;
// if the client is about to start, we are, by definition, not ready.
// Set ready to false now, then it'll be set to true when the sync
// listener we set below fires.
this.setState({ready: false});
// reset the 'have completed first sync' flag, // reset the 'have completed first sync' flag,
// since we're about to start the client and therefore about // since we're about to start the client and therefore about