display(macOS): fix crash due to error dialog showing on background t…

…hread Fixes #5472
utmapp · Jul 22, 2023 · 4d26f4a · 4d26f4a
1 parent f7c38dc
commit 4d26f4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Platform/macOS/Display/VMDisplayQemuTerminalWindowController.swift b/Platform/macOS/Display/VMDisplayQemuTerminalWindowController.swift
@@ -146,7 +146,9 @@ extension VMDisplayQemuTerminalWindowController: CSPortDelegate {
  }
 
  func port(_ port: CSPort, didError error: String) {
- showErrorAlert(error)
+ Task { @MainActor in
+ showErrorAlert(error)
+ }
  }
 
  func port(_ port: CSPort, didRecieveData data: Data) {

diff --git a/Platform/macOS/Display/VMDisplayWindowController.swift b/Platform/macOS/Display/VMDisplayWindowController.swift
@@ -204,6 +204,7 @@ class VMDisplayWindowController: NSWindowController, UTMVirtualMachineDelegate {
 
  // MARK: - Alert
 
+ @MainActor
  func showErrorAlert(_ message: String, completionHandler handler: ((NSApplication.ModalResponse) -> Void)? = nil) {
  let alert = NSAlert()
  alert.alertStyle = .critical
@@ -212,6 +213,7 @@ class VMDisplayWindowController: NSWindowController, UTMVirtualMachineDelegate {
  alert.beginSheetModal(for: window!, completionHandler: handler)
  }
 
+ @MainActor
  func showConfirmAlert(_ message: String, confirmHandler handler: (() -> Void)? = nil) {
  let alert = NSAlert()
  alert.alertStyle = .informational