From d539451f9e78044ad9400f11791b1451b3b199ff Mon Sep 17 00:00:00 2001 From: Jordan Doyle Date: Wed, 1 Nov 2023 01:34:43 +0000 Subject: [PATCH] Fix crashing when nothing is playing --- shalom/src/widgets/media_player.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/shalom/src/widgets/media_player.rs b/shalom/src/widgets/media_player.rs index c512fd9..b9af5aa 100644 --- a/shalom/src/widgets/media_player.rs +++ b/shalom/src/widgets/media_player.rs @@ -72,8 +72,16 @@ impl Component for MediaPlayer { container( row![ container(crate::widgets::track_card::track_card( - self.device.media_artist.as_ref().unwrap().to_string(), - self.device.media_title.as_ref().unwrap().to_string(), + self.device + .media_artist + .as_ref() + .map(ToString::to_string) + .unwrap_or_default(), + self.device + .media_title + .as_ref() + .map(ToString::to_string) + .unwrap_or_default(), self.image.clone(), ),) .width(Length::FillPortion(8)), @@ -120,11 +128,11 @@ impl Component for MediaPlayer { .style(Text::Color(SLATE_400)) .size(12), slider( - 0.0..=self.device.media_duration.unwrap().as_secs_f64(), + 0.0..=self.device.media_duration.unwrap_or_default().as_secs_f64(), state.track_position.as_secs_f64(), Event::PositionChange ), - text(format_time(self.device.media_duration.unwrap())) + text(format_time(self.device.media_duration.unwrap_or_default())) .style(Text::Color(SLATE_400)) .size(12), ] -- libgit2 1.7.2