Skip to content

Commit 6849624

Browse files
committed
refactor(windows): use native camera preview settings helper
1 parent 55707bf commit 6849624

1 file changed

Lines changed: 9 additions & 13 deletions

File tree

apps/desktop/src-tauri/src/windows.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,9 @@ pub(crate) async fn restore_main_window_inputs(app: &AppHandle) {
348348
let _ = camera_feed
349349
.ask(feeds::camera::RemoveSender(camera_ws_sender))
350350
.await;
351-
let _ = camera_feed.ask(feeds::camera::AddSender(sender)).await;
351+
if let Err(err) = sender.attach(&camera_feed).await {
352+
warn!(error = %err, "Failed to add native preview camera sender");
353+
}
352354
} else {
353355
#[allow(deprecated)]
354356
let _ = camera_feed
@@ -1065,10 +1067,8 @@ impl ShowCapWindow {
10651067
};
10661068
let mut app_state = state.write().await;
10671069

1068-
let enable_native_camera_preview = GeneralSettingsStore::get(app)
1069-
.ok()
1070-
.and_then(|v| v.map(|v| v.enable_native_camera_preview))
1071-
.unwrap_or_default();
1070+
let enable_native_camera_preview =
1071+
GeneralSettingsStore::native_camera_preview_enabled(app);
10721072

10731073
let shutdown_preview = if !enable_native_camera_preview {
10741074
app_state.camera_preview.begin_shutdown()
@@ -1146,10 +1146,8 @@ impl ShowCapWindow {
11461146
};
11471147
let mut app_state = state.write().await;
11481148

1149-
let enable_native_camera_preview = GeneralSettingsStore::get(app)
1150-
.ok()
1151-
.and_then(|v| v.map(|v| v.enable_native_camera_preview))
1152-
.unwrap_or_default();
1149+
let enable_native_camera_preview =
1150+
GeneralSettingsStore::native_camera_preview_enabled(app);
11531151

11541152
let shutdown_preview = if !enable_native_camera_preview {
11551153
app_state.camera_preview.begin_shutdown()
@@ -1922,10 +1920,8 @@ impl ShowCapWindow {
19221920
return Err(tauri::Error::WindowNotFound);
19231921
};
19241922

1925-
let enable_native_camera_preview = GeneralSettingsStore::get(app)
1926-
.ok()
1927-
.and_then(|v| v.map(|v| v.enable_native_camera_preview))
1928-
.unwrap_or_default();
1923+
let enable_native_camera_preview =
1924+
GeneralSettingsStore::native_camera_preview_enabled(app);
19291925

19301926
{
19311927
let Some(state) = app.try_state::<ArcLock<App>>() else {

0 commit comments

Comments
 (0)