From be7b06f5c8ec9e36701464aafb5eabcf362a7a27 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 13 Nov 2021 23:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=92=AD=E6=94=BE=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=88=97=E8=A1=A8=E6=97=B6=E5=AD=98=E5=9C=A8=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E6=AD=8C=E6=9B=B2=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=88=87=E6=AD=8C=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                 | 1 +
 src/renderer/store/modules/player.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index c42f5002..6c6ca70c 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,4 @@
 ### 修复
 
 - 修复设置-控制按钮位置选项与下载歌词编码格式选项命名冲突导致选项显示异常的问题
+- 修复播放下载列表时存在失效的歌曲会导致切歌不准确的问题
diff --git a/src/renderer/store/modules/player.js b/src/renderer/store/modules/player.js
index 72f4f1a4..235e3624 100644
--- a/src/renderer/store/modules/player.js
+++ b/src/renderer/store/modules/player.js
@@ -192,7 +192,7 @@ const getters = {
     //   listPlayIndex,
     //   isPlayList,
     //   isTempPlay,
-    //   // musicInfo: state.playMusicInfo.musicInfo,
+    //   musicInfo: state.playMusicInfo.musicInfo,
     // })
 
     // console.log(state.playMusicInfo)
@@ -305,7 +305,7 @@ const actions = {
     })
     if (!filteredList.length) return commit('setPlayMusicInfo', null)
 
-    let listPlayIndex = playInfo.listPlayIndex
+    let listPlayIndex = filteredList.indexOf(state.listInfo.list[playInfo.listPlayIndex])
     const currentListLength = state.listInfo.list.length - 1
     if (listPlayIndex == -1 && currentListLength) {
       listPlayIndex = prevListPlayIndex >= currentListLength ? 0 : prevListPlayIndex + 1
@@ -380,7 +380,7 @@ const actions = {
     })
 
     if (!filteredList.length) return commit('setPlayMusicInfo', null)
-    let listPlayIndex = playInfo.listPlayIndex
+    let listPlayIndex = filteredList.indexOf(state.listInfo.list[playInfo.listPlayIndex])
     const currentListLength = state.listInfo.list.length - 1
     if (listPlayIndex == -1 && currentListLength) {
       listPlayIndex = prevListPlayIndex > currentListLength ? currentListLength : prevListPlayIndex - 1