PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1131 from matrix-org/dbkr/another_first_sync_race

Browse source 
Fix another race with first-sync
This commit is contained in:
Richard van der Hoff 2017-06-21 11:46:19 +01:00 committed by GitHub
commit 879ca79c72
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/MatrixChat.js
View file

@ -942,10 +942,6 @@ module.exports = React.createClass({
dis.dispatch({action: 'view_home_page'}); dis.dispatch({action: 'view_home_page'});
} else if (this._is_registered) { } else if (this._is_registered) {
this._is_registered = false; this._is_registered = false;
// reset the 'have completed first sync' flag,
// since we've just logged in and will be about to sync
this.firstSyncComplete = false;
this.firstSyncPromise = q.defer();
// Set the display name = user ID localpart // Set the display name = user ID localpart
MatrixClientPeg.get().setDisplayName( MatrixClientPeg.get().setDisplayName(
@ -1015,6 +1011,12 @@ module.exports = React.createClass({
// Set ready to false now, then it'll be set to true when the sync // Set ready to false now, then it'll be set to true when the sync
// listener we set below fires. // listener we set below fires.
this.setState({ready: false}); this.setState({ready: false});
// reset the 'have completed first sync' flag,
// since we're about to start the client and therefore about
// to do the first sync
this.firstSyncComplete = false;
this.firstSyncPromise = q.defer();
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
// Allow the JS SDK to reap timeline events. This reduces the amount of // Allow the JS SDK to reap timeline events. This reduces the amount of