From b27a547fb8c7c40241703755429ea9eb5fa84399 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 29 Oct 2021 20:05:11 +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=E8=8E=B7=E5=8F=96URL=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E6=84=8F=E5=A4=96=E5=88=87=E6=AD=8C=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                    | 21 +--------------------
 src/renderer/components/core/Player.vue |  3 +++
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index cdb2853e..f9447d85 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,22 +1,3 @@
-### 新增
-
-- 添加黑色托盘图标
-- 自定义源新增`version`字段，新增`utils.buffer.bufToString`方法
-
-### 优化
-
-- 大幅优化我的列表、下载、歌单、排行榜列表性能，现在即使同一列表内的歌曲很多时也不会卡顿了
-- 优化列表同步代码逻辑
-- 优化开关评论时的动画性能
-- 优化进入、离开播放详情页的性能
-- 兼容桌面歌词以触摸的方式移动、调整大小
-- 调整图标尺寸
-
 ### 修复
 
-- 修复kg源的歌单链接无法打开的问题
-- 修复同一首歌的URL、歌词等同时需要换源时的处理问题
-
-### 其他
-
-- 更新 Electron 到 v15.3.0
+- 修复某些情况下获取URL失败时会意外切歌的问题
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 4a02fc1a..ae342919 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -634,6 +634,7 @@ export default {
         audio.src = this.musicInfo.url = url
       }).catch(err => {
         // console.log('err', err.message)
+        if (targetSong !== this.targetSong || this.isPlay) return
         if (err.message == requestMsg.cancelRequest) return
         if (!isRetryed) return this.setUrl(targetSong, isRefresh, true)
         this.status = this.statusText = err.message
@@ -676,8 +677,10 @@ export default {
         })
       }).catch((err) => {
         console.log(err)
+        if (targetSong.songmid !== this.musicInfo.songmid) return
         this.status = this.statusText = this.$t('core.player.lyric_error')
       }).finally(() => {
+        if (targetSong.songmid !== this.musicInfo.songmid) return
         this.handleUpdateWinLyricInfo('lyric', { lrc: this.musicInfo.lrc, tlrc: this.musicInfo.tlrc, lxlrc: this.musicInfo.lxlrc })
         this.setLyric()
       })