From b39c2c006545680684cc0f2c3e4ede0464946204 Mon Sep 17 00:00:00 2001
From: G2-Games <ke0bhogsg@gmail.com>
Date: Fri, 6 Oct 2023 01:22:55 -0500
Subject: [PATCH] Updated some small things, extra fixes

---
 src/music_controller/music_controller.rs | 2 +-
 src/music_storage/music_db.rs            | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/music_controller/music_controller.rs b/src/music_controller/music_controller.rs
index 7ae6e69..7d00b8a 100644
--- a/src/music_controller/music_controller.rs
+++ b/src/music_controller/music_controller.rs
@@ -74,7 +74,7 @@ impl MusicController {
         self.song_control(DecoderMessage::DSP(DSPMessage::UpdateProcessor(Box::new(self.music_player.music_processor.clone()))));
     }
     
-    /// Queries the library for a `Vec<Song>`
+    /// Queries the [MusicLibrary], returning a `Vec<Song>`
     pub fn query_library(
         &self,
         query_string: &String,
diff --git a/src/music_storage/music_db.rs b/src/music_storage/music_db.rs
index 25e7373..bf7dc23 100644
--- a/src/music_storage/music_db.rs
+++ b/src/music_storage/music_db.rs
@@ -420,7 +420,8 @@ impl MusicLibrary {
                 URI::Remote(_, path) if normalize(&path).contains(&normalize(&query_string)) => {
                     songs.lock().unwrap().push(track);
                     return
-                }, _ => ()
+                },
+                _ => ()
             };
         });
 
@@ -477,8 +478,8 @@ impl MusicLibrary {
                 }
             }
 
-            // If all tags are equal, sort by title
-            a.get_tag(&Tag::Title).cmp(&b.get_tag(&Tag::Title))
+            // If all tags are equal, sort by Track number
+            a.get_tag(&Tag::Track).cmp(&b.get_tag(&Tag::Track))
         });
 
         if new_songs.len() > 0 {