luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(native): do not crash on bootstrap if API is not available (#10582)

Browse Source
This commit is contained in:
Brooooooklyn
2025-03-03 10:15:42 +00:00
parent 2cd83be621
commit 899a957fab
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/frontend/native/media_capture/src/macos/screen_capture_kit.rs
View File

@@ -36,6 +36,7 @@ use screencapturekit::shareable_content::SCShareableContent;
use uuid::Uuid; use uuid::Uuid;
use crate::{ use crate::{
error::CoreAudioError,
pid::{audio_process_list, get_process_property}, pid::{audio_process_list, get_process_property},
tap_audio::{AggregateDevice, AudioTapStream}, tap_audio::{AggregateDevice, AudioTapStream},
}; };
@@ -73,8 +74,9 @@ unsafe impl Encode for NSRect {
const ENCODING: Encoding = Encoding::Struct("NSRect", &[<NSPoint>::ENCODING, <NSSize>::ENCODING]); const ENCODING: Encoding = Encoding::Struct("NSRect", &[<NSPoint>::ENCODING, <NSSize>::ENCODING]);
} }
static RUNNING_APPLICATIONS: LazyLock<RwLock<Vec<AudioObjectID>>> = static RUNNING_APPLICATIONS: LazyLock<
LazyLock::new(|| RwLock::new(audio_process_list().expect("Failed to get running applications"))); RwLock<std::result::Result<Vec<AudioObjectID>, CoreAudioError>>,
> = LazyLock::new(|| RwLock::new(audio_process_list()));
type ApplicationStateChangedSubscriberMap = type ApplicationStateChangedSubscriberMap =
HashMap<AudioObjectID, HashMap<Uuid, Arc<ThreadsafeFunction<(), ()>>>>; HashMap<AudioObjectID, HashMap<Uuid, Arc<ThreadsafeFunction<(), ()>>>>;
@@ -545,9 +547,8 @@ impl ShareableContent {
) )
}) })
.and_then(|mut running_applications| { .and_then(|mut running_applications| {
audio_process_list().map_err(From::from).map(|apps| { *running_applications = audio_process_list();
*running_applications = apps; Ok(())
})
}) })
{ {
callback.call(Err(err), ThreadsafeFunctionCallMode::NonBlocking); callback.call(Err(err), ThreadsafeFunctionCallMode::NonBlocking);
@@ -666,6 +667,7 @@ impl ShareableContent {
) )
})? })?
.iter() .iter()
.flatten()
.filter_map(|id| { .filter_map(|id| {
let tappable_app = match TappableApplication::new(*id) { let tappable_app = match TappableApplication::new(*id) {
Ok(app) => app, Ok(app) => app,