Prevent deadlock in maybeApplyUniversalTimer

2021-06-22 08:03:09 -07:00
parent 9f0c630574
commit cb0696d59d
1 changed files with 3 additions and 1 deletions
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -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);