From d9ced4e650eca9d3add3ce133467ba732d5058d0 Mon Sep 17 00:00:00 2001 From: arabian Date: Thu, 8 Jan 2026 02:45:07 +0300 Subject: [PATCH] fix: replace .except() with correct error handling --- src/types/audio_player.rs | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/types/audio_player.rs b/src/types/audio_player.rs index c9c5144..32ef9b1 100644 --- a/src/types/audio_player.rs +++ b/src/types/audio_player.rs @@ -108,24 +108,25 @@ impl AudioPlayer { } let pwsp_daemon_input = pwsp_daemon_input.unwrap(); - let current_input_device = self.current_input_device.clone().unwrap(); - let output_fl = current_input_device - .clone() - .output_fl - .expect("Failed to get pwsp-daemon output_fl"); - let output_fr = current_input_device - .clone() - .output_fr - .expect("Failed to get pwsp-daemon output_fl"); - let input_fl = pwsp_daemon_input - .clone() - .input_fl - .expect("Failed to get pwsp-daemon input_fl"); - let input_fr = pwsp_daemon_input - .clone() - .input_fr - .expect("Failed to get pwsp-daemon input_fr"); + + let Some(output_fl) = current_input_device.output_fl.clone() else { + println!("Failed to get pwsp-daemon output_fl"); + return Ok(()); + }; + let Some(output_fr) = current_input_device.output_fr.clone() else { + println!("Failed to get pwsp-daemon output_fr"); + return Ok(()); + }; + let Some(input_fl) = pwsp_daemon_input.input_fl.clone() else { + println!("Failed to get pwsp-daemon input_fl"); + return Ok(()); + }; + let Some(input_fr) = pwsp_daemon_input.input_fr.clone() else { + println!("Failed to get pwsp-daemon input_fr"); + return Ok(()); + }; + self.input_link_sender = Some(create_link(output_fl, output_fr, input_fl, input_fr)?); Ok(())