mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Prevent deadlock in maybeApplyUniversalTimer

Browse source
This commit is contained in:
Fedor Indutny 2021-06-22 08:03:09 -07:00 • committed by GitHub
parent 9f0c630574
commit cb0696d59d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/models/conversations.ts
View file

@ -2751,7 +2751,9 @@ export class ConversationModel extends window.Backbone
const expireTimer = universalExpireTimer.get();
if (expireTimer) {
await this.updateExpirationTimer(expireTimer);
// `updateExpirationTimer` calls `modifyGroupV2` and shouldn't be awaited
// since we run both on conversation's queue.
this.updateExpirationTimer(expireTimer);
}
this.set('pendingUniversalTimer', undefined);