From ca9003f0760c85c4b2a1bd67d6eea203f46a175e Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 23 Mar 2023 12:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BD=9C=E5=9C=A8=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/init/player/lyric.ts | 2 +-
 src/core/player/player.ts     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/init/player/lyric.ts b/src/core/init/player/lyric.ts
index 4881145..b5f9b7c 100644
--- a/src/core/init/player/lyric.ts
+++ b/src/core/init/player/lyric.ts
@@ -4,7 +4,7 @@ import { onDesktopLyricPositionChange, showDesktopLyric } from '@/core/desktopLy
 
 export default async(setting: LX.AppSetting) => {
   await initLyricPlayer()
-  setPlaybackRate(setting['player.playbackRate'])
+  void setPlaybackRate(setting['player.playbackRate'])
   toggleTranslation(setting['player.isShowLyricTranslation'])
   toggleRoma(setting['player.isShowLyricRoma'])
 
diff --git a/src/core/player/player.ts b/src/core/player/player.ts
index 7420d65..8c7eafa 100644
--- a/src/core/player/player.ts
+++ b/src/core/player/player.ts
@@ -214,6 +214,7 @@ const handlePlay = async() => {
  * @param index 播放的歌曲位置
  */
 export const playList = async(listId: string, index: number) => {
+  await pause()
   setPlayListId(listId)
   setPlayMusicInfo(listId, getList(listId)[index])
   clearPlayedList()
@@ -237,6 +238,7 @@ export const playNext = async(isAutoToggle = false): Promise<void> => {
   if (playerState.tempPlayList.length) { // 如果稍后播放列表存在歌曲则直接播放改列表的歌曲
     const playMusicInfo = playerState.tempPlayList[0]
     removeTempPlayList(0)
+    await pause()
     setPlayMusicInfo(playMusicInfo.listId, playMusicInfo.musicInfo, playMusicInfo.isTempPlay)
     await handlePlay()
     return
@@ -275,6 +277,7 @@ export const playNext = async(isAutoToggle = false): Promise<void> => {
 
     if (index < playedList.length) {
       const playMusicInfo = playedList[index]
+      await pause()
       setPlayMusicInfo(playMusicInfo.listId, playMusicInfo.musicInfo, playMusicInfo.isTempPlay)
       await handlePlay()
       return
@@ -326,6 +329,7 @@ export const playNext = async(isAutoToggle = false): Promise<void> => {
     isTempPlay: false,
   }
 
+  await pause()
   setPlayMusicInfo(nextPlayMusicInfo.listId, nextPlayMusicInfo.musicInfo)
   await handlePlay()
 }
@@ -365,6 +369,7 @@ export const playPrev = async(isAutoToggle = false): Promise<void> => {
 
     if (index > -1) {
       const playMusicInfo = playedList[index]
+      await pause()
       setPlayMusicInfo(playMusicInfo.listId, playMusicInfo.musicInfo, playMusicInfo.isTempPlay)
       await handlePlay()
       return
@@ -416,6 +421,7 @@ export const playPrev = async(isAutoToggle = false): Promise<void> => {
     isTempPlay: false,
   }
 
+  await pause()
   setPlayMusicInfo(nextPlayMusicInfo.listId, nextPlayMusicInfo.musicInfo)
   await handlePlay()
 }