2 files changed, 8 insertions, 11 deletions
diff --git a/src/app.rs b/src/app.rs
index 5d749b2..0af00a8 100755
--- a/src/app.rs
+++ b/src/app.rs
@@ -114,7 +114,8 @@ impl App {
 
                 let mut status = false;
                 for (i, song) in self.queue_list.list.clone().iter().enumerate() {
-                    if song.file.contains(file) {
+                    let song_path = song.file.split("/").last().unwrap_or_default();
+                    if song_path.eq(file) {
                         self.conn.conn.delete(i as u32).unwrap();
                         status = true;
                     }
@@ -145,7 +146,7 @@ impl App {
                     .to_string();
 
                 for (i, song) in self.queue_list.list.clone().iter().enumerate() {
-                    if song.file.contains(&file) {
+                    if song.file.eq(&file) {
                         self.conn.conn.delete(i as u32).unwrap();
                         if self.queue_list.index == self.queue_list.list.len() - 1
                             && self.queue_list.index != 0
@@ -186,14 +187,10 @@ impl App {
                 browser.selected = 0;
             }
         } else {
-            let index = self
-                .queue_list
-                .list
-                .iter()
-                .position(|x| {
-                    let file = x.file.split("/").last().unwrap();
-                    file.eq(path)
-                });
+            let index = self.queue_list.list.iter().position(|x| {
+                let file = x.file.split("/").last().unwrap_or_default();
+                file.eq(path)
+            });
 
             if index.is_some() {
                 self.conn.conn.switch(index.unwrap() as u32)?;
diff --git a/src/ui.rs b/src/ui.rs
index 0a5aa37..43f7c6d 100755
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -76,7 +76,7 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
 
             let mut status: bool = false;
             for sn in app.queue_list.list.iter() {
-                let file = sn.file.split("/").last().unwrap();
+                let file = sn.file.split("/").last().unwrap_or_default();
                 if file.eq(s) {
                     status = true;
                 }