From ccaf485c91cb2659268be73916115bc791eca689 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 14 Mar 2020 00:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md           | 1 +
 src/renderer/views/Setting.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 1b1709ec..a3b0ac54 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -17,6 +17,7 @@
 
 - 修复歌单详情处于加载状态时无法返回的问题
 - 修复鼠标右击复制列表内容时会复制音质标签的问题
+- 修复`0.6.2`及以前的版本导出的“所有数据”内的歌曲列表无法导入的问题
 
 ### 其他
 
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index 6b76bb15..7f7c44fd 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -458,6 +458,9 @@ export default {
       const { version: settingVersion, setting } = updateSetting(allData.setting)
       this.refreshSetting(setting, settingVersion)
 
+      // 兼容0.6.2及以前版本的列表数据
+      if (allData.defaultList) return this.setList({ id: 'default', list: allData.defaultList.list })
+
       for (const list of allData.playList) {
         this.setList({ id: list.id, list: list.list })
       }
@@ -569,7 +572,7 @@ export default {
       })
     },
     handleWindowSizeChange(index) {
-      let info = this.windowSizeList[index]
+      let info = index == null ? this.windowSizeList[2] : this.windowSizeList[index]
       setWindowSize(info.width, info.height)
     },
     refreshSetting(setting, version) {