From fe07ac025a3a3a28a0e5c06fc06c4106e878bea4 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 11 Mar 2022 21:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/utils.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/common/utils.js b/src/common/utils.js
index f6b8e97d..9cc5f782 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -157,17 +157,6 @@ exports.initSetting = isShowErrorAlert => {
       electronStore_config.set('setting.list.isSaveScrollLocation', scroll.enable)
       delete setting.list.scroll
     }
-
-    if (setting.player.isShowLyricTransition != null) { // 修正拼写问题 v1.8.2 及以前
-      setting.player.isShowLyricTranslation = setting.player.isShowLyricTransition
-      delete setting.player.isShowLyricTransition
-    }
-
-    // 迁移v1.19.0之前的主题设置
-    if (setting.themeId != null) {
-      setting.theme.id = setting.themeId
-      delete setting.themeId
-    }
   }
 
   // 从我的列表分离下载列表 v1.7.0 后
@@ -179,6 +168,18 @@ exports.initSetting = isShowErrorAlert => {
 
   const { version: settingVersion, setting: newSetting } = exports.mergeSetting(setting, electronStore_config.get('version'))
 
+  // 修正拼写问题 v1.8.2 及以前
+  if (newSetting.player.isShowLyricTransition != null) {
+    newSetting.player.isShowLyricTranslation = newSetting.player.isShowLyricTransition
+    delete newSetting.player.isShowLyricTransition
+  }
+
+  // 迁移v1.19.0之前的主题设置
+  if (newSetting.themeId != null) {
+    newSetting.theme.id = newSetting.themeId
+    delete newSetting.themeId
+  }
+
   // 重置 ^0.18.2 排行榜ID
   if (!newSetting.leaderboard.tabId.includes('__')) newSetting.leaderboard.tabId = 'kw__16'