Merge branch 'mkirk/fix-receiving-calls'

7 years ago · c82571bd37
parent d3362d5b4a e3469649f7
commit c82571bd37
1 changed files with 6 additions and 1 deletions
--- a/Signal/src/call/CallService.swift
+++ b/Signal/src/call/CallService.swift
@ -584,8 +584,13 @@ protocol CallServiceObserver: class {

        self.call = newCall

-        var backgroundTask = OWSBackgroundTask(label:"\(#function)", completionBlock: { [weak self] _ in
+        var backgroundTask = OWSBackgroundTask(label:"\(#function)", completionBlock: { [weak self] status in
            AssertIsOnMainThread()
+
+            guard status == .expired else {
+                return
+            }
+
            guard let strongSelf = self else {
                return
            }