settings(apple): fix settings cancel running on wrong actor

utmapp · Dec 16, 2022 · f5c2cfd · f5c2cfd
1 parent 3a79d06
commit f5c2cfd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Managers/UTMAppleVirtualMachine.swift b/Managers/UTMAppleVirtualMachine.swift
@@ -67,15 +67,13 @@ import Virtualization
 
     private var activeResourceUrls: [URL] = []
 
-    override func reloadConfiguration() throws {
+    @MainActor override func reloadConfiguration() throws {
         let newConfig = try UTMAppleConfiguration.load(from: path) as! UTMAppleConfiguration
         let oldConfig = appleConfig
         config = UTMConfigurationWrapper(wrapping: newConfig)
-        Task { @MainActor in
-            updateConfigFromRegistry()
-            if #available(macOS 12, *) {
-                newConfig.system.boot.macRecoveryIpswURL = oldConfig.system.boot.macRecoveryIpswURL
-            }
+        updateConfigFromRegistry()
+        if #available(macOS 12, *) {
+            newConfig.system.boot.macRecoveryIpswURL = oldConfig.system.boot.macRecoveryIpswURL
         }
     }
 

diff --git a/Platform/macOS/VMSettingsView.swift b/Platform/macOS/VMSettingsView.swift
@@ -64,8 +64,8 @@ struct VMSettingsView<Config: UTMConfiguration>: View {
 
     func cancel() {
         presentationMode.wrappedValue.dismiss()
-        data.busyWork {
-            try data.discardChanges(for: self.vm)
+        data.busyWorkAsync {
+            try await data.discardChanges(for: self.vm)
         }
     }
 }