From 0f957efcd82494c45c486a8ccead468c37f101f9 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Thu, 7 Oct 2021 16:53:38 +1100
Subject: [PATCH] minor fix

---
 Session/Meta/AppDelegate.swift | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift
index 764e36fdd..3d1b56ba5 100644
--- a/Session/Meta/AppDelegate.swift
+++ b/Session/Meta/AppDelegate.swift
@@ -29,18 +29,17 @@ extension AppDelegate {
         // Answer messages
         MessageReceiver.handleAnswerCallMessage = { message in
             DispatchQueue.main.async {
-                if let incomingCallBanner = IncomingCallBanner.current, incomingCallBanner.uuid == message.uuid! { incomingCallBanner.dismiss() }
-                if let callVC = CurrentAppContext().frontmostViewController() as? CallVC { callVC.handleAnswerMessage(message) }
-                WebRTCSession.current?.dropConnection()
-                WebRTCSession.current = nil
+                guard let callVC = CurrentAppContext().frontmostViewController() as? CallVC else { return }
+                callVC.handleAnswerMessage(message)
             }
         }
         // End call messages
         MessageReceiver.handleEndCallMessage = { message in
             DispatchQueue.main.async {
                 if let currentBanner = IncomingCallBanner.current { currentBanner.dismiss() }
-                guard let callVC = CurrentAppContext().frontmostViewController() as? CallVC else { return }
-                callVC.handleEndCallMessage(message)
+                if let callVC = CurrentAppContext().frontmostViewController() as? CallVC { callVC.handleEndCallMessage(message) }
+                WebRTCSession.current?.dropConnection()
+                WebRTCSession.current = nil
             }
         }
     }