colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
1 changed files with 3 additions and 1 deletions
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(); const expireTimer = universalExpireTimer.get();
if (expireTimer) { 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); this.set('pendingUniversalTimer', undefined);