TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-28 15:41:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Address code review feedback: fix memory lifecycle and improve error message

Browse Source 
- Move capture session lifecycle to main thread
- Add strong capture of captureSession in asyncAfter block to prevent premature deallocation
- Improve error message to inform user about potential impact and suggested action

Co-authored-by: rustdesk <71636191+rustdesk@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-02-07 03:45:47 +00:00
parent 780c396541
commit 370b467b71
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
flutter/macos/Runner/MainFlutterWindow.swift
View File

@@ -216,23 +216,26 @@ class MainFlutterWindow: NSWindow {
AVCaptureDevice.requestAccess(for: .audio, completionHandler: { granted in AVCaptureDevice.requestAccess(for: .audio, completionHandler: { granted in
if granted { if granted {
// Instantiate an audio capture session to trigger macOS registration // Instantiate an audio capture session to trigger macOS registration
if let audioDevice = AVCaptureDevice.default(for: .audio) { // This needs to run on main thread to ensure proper lifecycle
do { DispatchQueue.main.async {
let audioInput = try AVCaptureDeviceInput(device: audioDevice) if let audioDevice = AVCaptureDevice.default(for: .audio) {
let captureSession = AVCaptureSession() do {
captureSession.beginConfiguration() let audioInput = try AVCaptureDeviceInput(device: audioDevice)
if captureSession.canAddInput(audioInput) { let captureSession = AVCaptureSession()
captureSession.addInput(audioInput) captureSession.beginConfiguration()
if captureSession.canAddInput(audioInput) {
captureSession.addInput(audioInput)
}
captureSession.commitConfiguration()
// Start and immediately stop the session to trigger registration
captureSession.startRunning()
// Keep a strong reference and stop after a brief moment
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [captureSession] in
captureSession.stopRunning()
}
} catch {
NSLog("[RustDesk] Error creating audio capture session for permission registration: %@. The app may not appear in System Settings > Privacy & Security > Microphone. Please verify permissions manually.", error.localizedDescription)
} }
captureSession.commitConfiguration()
// Start and immediately stop the session to trigger registration
captureSession.startRunning()
// Stop after a brief moment to ensure registration is complete
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
captureSession.stopRunning()
}
} catch {
NSLog("[RustDesk] Error creating audio capture session for permission registration: %@", error.localizedDescription)
} }
} }
} }