Skip to content

Fix panic hook to handle audio backend errors and improve error messaging #184

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
LargeModGames merged 1 commit into from
Mar 21, 2026
Merged

Fix panic hook to handle audio backend errors and improve error messaging #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,12 +737,15 @@ fn setup_logging() -> anyhow::Result<()> {
fn install_panic_hook() {
let default_hook = panic::take_hook();
panic::set_hook(Box::new(move |info| {
let is_portaudio_panic = info
let is_audio_backend_panic = info
.location()
.map(|location| location.file().contains("audio_backend/portaudio.rs"))
.map(|location| {
let file = location.file();
file.contains("audio_backend/portaudio.rs") || file.contains("audio_backend/rodio.rs")
})
.unwrap_or(false);

if is_portaudio_panic {
if is_audio_backend_panic {
eprintln!(
"Recoverable audio backend panic detected. Playback may pause while the output device changes."
);
Expand Down Expand Up @@ -2084,9 +2087,7 @@ async fn disconnect_streaming_player(
status_message: &str,
) -> Option<StreamingRecoveryRequest> {
let mut app_lock = app.lock().await;
let Some(current_player) = app_lock.streaming_player.as_ref() else {
return None;
};
let current_player = app_lock.streaming_player.as_ref()?;
if !Arc::ptr_eq(current_player, player) {
return None;
}
Expand Down
Loading