Merge branch 'develop' into doug/fix_macos_apple_silicon

This commit is contained in:
Doug
2021-07-06 09:27:34 +01:00
committed by GitHub
2 changed files with 4 additions and 1 deletions
+1
View File
@@ -8,6 +8,7 @@ Changes to be released in next version
*
🐛 Bugfix
* VoIP: Do not present ended calls.
* Fix crash on Apple Silicon Macs.
⚠️ API Changes
+3 -1
View File
@@ -393,7 +393,9 @@ class CallPresenter: NSObject {
if let oldCallVC = self.callVCs.values.first,
self.presentedCallVC == nil,
!self.uiOperationQueue.containsPresentCallVCOperation,
!self.uiOperationQueue.containsEnterPiPOperation {
!self.uiOperationQueue.containsEnterPiPOperation,
let oldCall = oldCallVC.mxCall,
oldCall.state != .ended {
// present the call screen after dismissing this one
self.presentCallVC(oldCallVC)
}