fix: crash dismissPresentedViewController - WPB-15345 (#2442)

wireapp · Jan 29, 2025 · aadbf7d · aadbf7d
1 parent b4d966a
commit aadbf7d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/WireUI/Sources/WireMainNavigationUI/Coordinator/MainCoordinator.swift b/WireUI/Sources/WireMainNavigationUI/Coordinator/MainCoordinator.swift
@@ -194,7 +194,8 @@ public final class MainCoordinator<Dependencies>: NSObject, MainCoordinatorProto
         conversation: ConversationModel,
         message: ConversationMessageModel?
     ) {
-        Task {
+        Task { [weak self] in
+            guard let self else { return }
             if mainSplitViewState == .expanded, splitViewController.splitBehavior == .overlay {
                 splitViewController.hideSidebar()
             }
@@ -288,7 +289,9 @@ public final class MainCoordinator<Dependencies>: NSObject, MainCoordinatorProto
 
     public func dismissPresentedViewController() async {
         await withCheckedContinuation { continuation in
-            splitViewController.dismiss(animated: true, completion: continuation.resume)
+            if splitViewController != nil {
+                splitViewController.dismiss(animated: true, completion: continuation.resume)
+            }
         }
     }