Merge pull request #3654 from matrix-org/dbkr/call_crash_workaround

Workaround for soft-crash with calls on startup
This commit is contained in:
David Baker 2019-11-21 17:43:14 +00:00 committed by GitHub
commit 1a7d298319
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -90,6 +90,13 @@ module.exports = createReactClass({
} }
} else { } else {
call = CallHandler.getAnyActiveCall(); call = CallHandler.getAnyActiveCall();
// Ignore calls if we can't get the room associated with them.
// I think the underlying problem is that the js-sdk sends events
// for calls before it has made the rooms available in the store,
// although this isn't confirmed.
if (MatrixClientPeg.get().getRoom(call.roomId) === null) {
call = null;
}
this.setState({ call: call }); this.setState({ call: call });
} }