From d251d31c57a8ec7d1c34a0efec4b86271a1617c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <ciaranainsworth@posteo.net>
Date: Mon, 6 Jan 2020 10:11:26 +0100
Subject: [PATCH] Resolve "Adding album mixes up tracks if multiple discs
 present"

---
 changes/changelog.d/1006.bugfix           | 1 +
 front/src/components/audio/PlayButton.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changes/changelog.d/1006.bugfix

diff --git a/changes/changelog.d/1006.bugfix b/changes/changelog.d/1006.bugfix
new file mode 100644
index 0000000000..57e3b1269a
--- /dev/null
+++ b/changes/changelog.d/1006.bugfix
@@ -0,0 +1 @@
+Resolve an issue where disc numbers were not taken into consideration when playing an album from the album card (#1006)
\ No newline at end of file
diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue
index 970ca55679..5462c599a5 100644
--- a/front/src/components/audio/PlayButton.vue
+++ b/front/src/components/audio/PlayButton.vue
@@ -189,10 +189,10 @@ export default {
             resolve(tracks)
           })
         } else if (self.artist) {
-          let params = {'artist': self.artist.id, 'ordering': 'album__release_date,position'}
+          let params = {'artist': self.artist.id, 'ordering': 'album__release_date,disc_number,position'}
           self.getTracksPage(1, params, resolve)
         } else if (self.album) {
-          let params = {'album': self.album.id, 'ordering': 'position'}
+          let params = {'album': self.album.id, 'ordering': 'disc_number,position'}
           self.getTracksPage(1, params, resolve)
         }
       })
-- 
GitLab