Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions Platform/macOS/Display/VMDisplayQemuDisplayController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,34 @@ extension VMDisplayQemuWindowController: CSUSBManagerDelegate {

func spiceUsbManager(_ usbManager: CSUSBManager, deviceAttached device: CSUSBDevice) {
logger.debug("USB device attached: \(device)")
if !isNoUsbPrompt {
Task { @MainActor in
if self.window!.isKeyWindow && self.vm.state == .started {
Task.detached {
// looking the device up reads its descriptors, which is kept off the main thread
let isAutoConnect = self.isAutoConnect(device)
await MainActor.run {
guard self.vm.state == .started else {
return
}
if isAutoConnect {
// also brings back a device that restarted itself, as one does after a firmware update
if usbManager.canRedirectUsbDevice(device, errorMessage: nil) && !usbManager.isUsbDeviceConnected(device) {
self.autoConnect(device, with: usbManager)
}
} else if !self.isNoUsbPrompt && self.window!.isKeyWindow {
self.showConnectPrompt(for: device)
}
}
}
}

/// Connect a device that is set to connect by itself
private func autoConnect(_ device: CSUSBDevice, with usbManager: CSUSBManager) {
withErrorAlert {
try await usbManager.connectUsbDeviceAfterUnmounting(device)
await MainActor.run {
self.primaryDisplayController.connectedUsbDevices.append(device)
}
}
}

func spiceUsbManager(_ usbManager: CSUSBManager, deviceRemoved device: CSUSBDevice) {
logger.debug("USB device removed: \(device)")
Expand Down Expand Up @@ -516,12 +536,7 @@ extension VMDisplayQemuWindowController {
}
let filtered = devices.filter({ self.isAutoConnect($0) })
for device in filtered {
self.withErrorAlert {
try await usbManager.connectUsbDeviceAfterUnmounting(device)
await MainActor.run {
self.connectedUsbDevices.append(device)
}
}
self.autoConnect(device, with: usbManager)
}
}
}
Expand Down
Loading