OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't crash if a keyshare request is removed 

...during the time the dialog is displayed.

Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully)
pull/21833/head
David Baker 2020-01-03 11:12:55 +00:00
parent 560cff0ae1
commit 557669b08e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/KeyRequestHandler.js
View File

@ -111,6 +111,12 @@ export default class KeyRequestHandler {
this._currentUser = null; this._currentUser = null;
this._currentDevice = null; this._currentDevice = null;
if (!this._pendingKeyRequests[userId] || !this._pendingKeyRequests[userId][deviceId]) {
// request was removed in the time the dialog was displayed
this._processNextRequest();
return;
}
if (r) { if (r) {
for (const req of this._pendingKeyRequests[userId][deviceId]) { for (const req of this._pendingKeyRequests[userId][deviceId]) {
req.share(); req.share();