Merge pull request #105 from aaronraimist/main-thread-crash-mojave

Fix NSInternalInconsistencyException crash by showing sheet on main thread
neilalexander · Dec 20, 2018 · f697a8c · f697a8c
2 parents 1e1b8c5 + 67da1ac
commit f697a8c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Seaglass/Controller/Main View/MainViewController.swift b/Seaglass/Controller/Main View/MainViewController.swift
@@ -83,10 +83,12 @@ class MainViewController: NSSplitViewController, MatrixServicesDelegate {
 
         MatrixServices.inst.session.crypto.deviceList.downloadKeys([request.userId], forceDownload: false, success: { (devicemap) in
             if MatrixServices.inst.session.crypto.deviceList.storedDevice(request.userId, deviceId: request.deviceId) != nil {
-                let sheet = self.storyboard?.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("KeyRequest")) as! MainViewKeyRequestController
-                sheet.request = request
-                self.presentViewControllerAsSheet(sheet)
-                self.keyRequests.append(sheet)
+                DispatchQueue.main.async {
+                    let sheet = self.storyboard?.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("KeyRequest")) as! MainViewKeyRequestController
+                    sheet.request = request
+                    self.presentViewControllerAsSheet(sheet)
+                    self.keyRequests.append(sheet)
+                }
             }
         }) { (error) in
         }