vm: fix screenshot timer

Fixes #5541
utmapp · Aug 21, 2023 · 9176aba · 9176aba
1 parent fc6a6e1
commit 9176aba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Services/UTMAppleVirtualMachine.swift b/Services/UTMAppleVirtualMachine.swift
@@ -534,6 +534,7 @@ extension UTMAppleVirtualMachine: VZVirtualMachineDelegate {
                 }
             }
         }
+        try? saveScreenshot()
         state = .stopped
     }
 

diff --git a/Services/UTMQemuVirtualMachine.swift b/Services/UTMQemuVirtualMachine.swift
@@ -415,7 +415,6 @@ extension UTMQemuVirtualMachine {
             throw UTMQemuVirtualMachineError.invalidVmState
         }
         await takeScreenshot()
-        try saveScreenshot()
         try await monitor.qemuStop()
     }
 
@@ -551,6 +550,7 @@ extension UTMQemuVirtualMachine: QEMUVirtualMachineDelegate {
         swtpm = nil
         ioService = nil
         ioServiceDelegate = nil
+        try? saveScreenshot()
         state = .stopped
     }
 

diff --git a/Services/UTMVirtualMachine.swift b/Services/UTMVirtualMachine.swift
@@ -293,7 +293,7 @@ extension UTMVirtualMachine {
         if !isScreenshotSaveEnabled && !isRunningAsDisposible {
             try? deleteScreenshot()
         }
-        return Timer.scheduledTimer(withTimeInterval: kScreenshotPeriodSeconds, repeats: true) { [weak self] timer in
+        let timer = Timer(timeInterval: kScreenshotPeriodSeconds, repeats: true) { [weak self] timer in
             guard let self = self else {
                 timer.invalidate()
                 return
@@ -304,6 +304,8 @@ extension UTMVirtualMachine {
                 }
             }
         }
+        RunLoop.main.add(timer, forMode: .default)
+        return timer
     }
 
     func loadScreenshot() -> PlatformImage? {