From e0e82e7246b26154a2f9c5cf70bfe68a7dfe918b Mon Sep 17 00:00:00 2001
From: haveac1gar <50358982+haveac1gar@users.noreply.github.com>
Date: Tue, 6 Jan 2026 07:15:15 +0300
Subject: [PATCH] Added sorting by Disc Number and Track Number for
 SongListSort.COMMENT (#1518)

---
 src/shared/api/utils.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/shared/api/utils.ts b/src/shared/api/utils.ts
index cfb3f04d7..475c98f50 100644
--- a/src/shared/api/utils.ts
+++ b/src/shared/api/utils.ts
@@ -180,7 +180,11 @@ export const sortSongList = (songs: Song[], sortBy: SongListSort, sortOrder: Sor
             break;
 
         case SongListSort.COMMENT:
-            results = orderBy(results, ['comment'], [order]);
+            results = orderBy(
+                results,
+                ['comment', 'discNumber', 'trackNumber'],
+                [order, order, 'asc', 'asc'],
+            );
             break;
 
         case SongListSort.DURATION: