From 7a47332cec4f833e9ba03cfd8653a9f0462c5bec Mon Sep 17 00:00:00 2001
From: mustafa salih <mustafasalih1991@gmail.com>
Date: Tue, 12 Jan 2021 06:36:48 +0300
Subject: fixed mpd crash caused by unwraping

---
 src/lib.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index 6a29067..d417164 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -770,7 +770,13 @@ pub fn get_mpd_current(config: &Config) -> String {
         Ok(connection) => connection,
         _ => return String::from(""),
     };
-    let current: Song = conn.currentsong().unwrap().unwrap();
+    let current: Song = match conn.currentsong() {
+        Ok(opt) => match opt {
+            Some(song) => song,
+            _ => return String::from(""),
+        },
+        _ => return String::from(""),
+    };
 
     let result = format!(
         "  {}  {}  {}",
-- 
cgit v1.2.3