From 364260b070db67a14dfcaed211a8e90efaec31ff Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 12 Aug 2021 10:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=88=87=E6=AD=8C=E6=B7=B7=E4=B9=B1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md               |  5 +----
 src/renderer/store/modules/list.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 00e049cc..91f91b8b 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,6 +1,3 @@
 ### 修复
 
-- 修复播放下载列表的歌曲时切歌的问题
-- 修复播放下载列表的歌曲时歌词无法显示的问题
-- 修复下载列表稍后播放功能无效的问题
-- 修复同步服务器启动失败时，关闭同步服务不会清空失败信息的问题
+- 修复某些情况下同步功能会导致切歌混乱的问题
diff --git a/src/renderer/store/modules/list.js b/src/renderer/store/modules/list.js
index b53c6d71..30034f64 100644
--- a/src/renderer/store/modules/list.js
+++ b/src/renderer/store/modules/list.js
@@ -82,6 +82,16 @@ const mutations = {
   setSyncListData(state, { defaultList, loveList, userList }) {
     state.defaultList.list.splice(0, state.defaultList.list.length, ...defaultList.list)
     state.loveList.list.splice(0, state.loveList.list.length, ...loveList.list)
+    for (let index = 0; index < userList.length; index++) {
+      const list = userList[index]
+      const targetList = allList[list.id]
+      if (targetList) {
+        userList.splice(index, 1, targetList)
+        targetList.name = list.name
+        targetList.list.splice(0, targetList.list.length, ...list.list)
+      }
+    }
+    console.log()
     state.userList = userList
     allListInit(state.defaultList, state.loveList, state.userList)
   },