From 2d5e336f0f380243f503155390b5ebc55a716651 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 23 Nov 2022 18:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A8=8B=E5=BA=8F=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=A1=BA=E5=BA=8F=E5=AF=BC=E8=87=B4=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

---
 src/renderer/core/apiSource.ts             | 4 ++--
 src/renderer/core/useApp/useDataInit.ts    | 2 +-
 src/renderer/core/useApp/useInitUserApi.ts | 4 ++--
 src/renderer/core/useApp/useSettingSync.ts | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/core/apiSource.ts b/src/renderer/core/apiSource.ts
index a72e8c6e..7bd51351 100644
--- a/src/renderer/core/apiSource.ts
+++ b/src/renderer/core/apiSource.ts
@@ -5,13 +5,13 @@ import musicSdk from '@renderer/utils/musicSdk'
 import apiSourceInfo from '@renderer/utils/musicSdk/api-source-info'
 
 
-export const setUserApi = (apiId: string) => {
+export const setUserApi = async(apiId: string) => {
   if (/^user_api/.test(apiId)) {
     qualityList.value = {}
     userApi.status = false
     userApi.message = 'initing'
 
-    setUserApiAction(apiId).then(() => {
+    await setUserApiAction(apiId).then(() => {
       apiSource.value = apiId
     }).catch(err => {
       console.log(err)
diff --git a/src/renderer/core/useApp/useDataInit.ts b/src/renderer/core/useApp/useDataInit.ts
index c1d254c4..1028aba6 100644
--- a/src/renderer/core/useApp/useDataInit.ts
+++ b/src/renderer/core/useApp/useDataInit.ts
@@ -14,7 +14,7 @@ const initPrevPlayInfo = async() => {
   window.lx.restorePlayInfo = null
   if (!info?.listId || info.index < 0) return
   const list = await getListMusics(info.listId)
-  if (!list || !list[info.index]) return
+  if (!list?.[info.index]) return
   window.lx.restorePlayInfo = info
   playList(info.listId, info.index)
 
diff --git a/src/renderer/core/useApp/useInitUserApi.ts b/src/renderer/core/useApp/useInitUserApi.ts
index c41d23ea..8416d48e 100644
--- a/src/renderer/core/useApp/useInitUserApi.ts
+++ b/src/renderer/core/useApp/useInitUserApi.ts
@@ -95,8 +95,8 @@ export default () => {
   })
 
   return async() => {
-    void setUserApi(appSetting['common.apiSource'])
-    return await getUserApiList().then(list => {
+    await setUserApi(appSetting['common.apiSource'])
+    void getUserApiList().then(list => {
       // console.log(list)
       // if (![...apiSourceInfo.map(s => s.id), ...list.map(s => s.id)].includes(appSetting['common.apiSource'])) {
       //   console.warn('reset api')
diff --git a/src/renderer/core/useApp/useSettingSync.ts b/src/renderer/core/useApp/useSettingSync.ts
index d87af689..0f873ea0 100644
--- a/src/renderer/core/useApp/useSettingSync.ts
+++ b/src/renderer/core/useApp/useSettingSync.ts
@@ -23,7 +23,7 @@ export default () => {
   })
 
   watch(() => appSetting['common.apiSource'], apiSource => {
-    setUserApi(apiSource)
+    void setUserApi(apiSource)
   })
 
   watch(() => appSetting['common.font'], (val) => {