Skip to content

chore: not spawn play_sound_file if playing is muted #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vjousse merged 2 commits into from
Feb 17, 2026
Merged

chore: not spawn play_sound_file if playing is muted #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d79366d
more readable name
horpto Feb 3, 2026
7e927cd
not spawn if sound disabled
horpto Feb 3, 2026
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
16 changes: 8 additions & 8 deletions src-tauri/src/gui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,6 @@ async fn tick(app_handle: AppHandle, path: String) {
match app_handle.get_webview_window("main") {
Some(window) => {
while let Some(_ts) = stream.next().await {
let new_path = path.clone();

let state: tauri::State<AppState> = app_handle.state();
let new_state = state.clone();
let mut state_guard = new_state.0.lock().await;
Expand All @@ -468,17 +466,19 @@ async fn tick(app_handle: AppHandle, path: String) {

let _ = window.emit("external-message", state_guard.pomodoro.to_unborrowed());

tauri::async_runtime::spawn_blocking(move || {
if play_tick {
if play_tick {
let new_path = path.clone();

tauri::async_runtime::spawn_blocking(move || {
// Fail silently if we can't play sound file
let play_sound_file_result = sound::play_sound_file(&new_path);
if play_sound_file_result.is_err() {
eprintln!(
"Unable to play sound file {new_path:?}: {play_sound_file_result:?}"
);
}
}
});
});
}
}
}
None => eprintln!("Impossible to get main window for tick sound"),
Expand Down Expand Up @@ -514,7 +514,7 @@ async fn change_icon<R: tauri::Runtime>(
) {
Ok(icon_path_buf) => {
if let Some(tray) = app_handle.tray_by_id("app-tray") {
let icon_path = tauri::image::Image::from_path(icon_path_buf.clone()).ok();
let icon_img = tauri::image::Image::from_path(icon_path_buf.clone()).ok();

// Don't let tauri choose where to store the temp icon path as it will by default store it to `/tmp`.
// Setting it manually allows the tray icon to work properly in sandboxes env like Flatpak
Expand All @@ -527,7 +527,7 @@ async fn change_icon<R: tauri::Runtime>(
.unwrap();

let _ = tray.set_temp_dir_path(Some(local_data_path));
let _ = tray.set_icon(icon_path);
let _ = tray.set_icon(icon_img);
}
}
Err(e) => eprintln!("{e:?}"),
Expand Down