From 3a371f8d754ba80c2d6332d2faaf77ae38604e9a Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 13 Nov 2021 23:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE-=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E4=B8=8E=E4=B8=8B=E8=BD=BD=E6=AD=8C=E8=AF=8D=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=80=89=E9=A1=B9=E5=91=BD=E5=90=8D=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E5=AF=BC=E8=87=B4=E9=80=89=E9=A1=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md           | 4 ++--
 src/renderer/views/Setting.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 2361739c..c42f5002 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,3 @@
-### 其他
+### 修复
 
-- 降级electron到v13.4.0（这修复了windows 7下播放歌曲时软件会崩溃的问题）
+- 修复设置-控制按钮位置选项与下载歌词编码格式选项命名冲突导致选项显示异常的问题
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index 143ec40e..8941c205 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -157,7 +157,7 @@ div(:class="$style.main")
         h3#download_lyric {{$t('view.setting.download_lyric_format')}}
         div
           material-checkbox(v-for="item in lrcFormatList" :key="item.id" :class="$style.gapLeft" :id="`setting_download_lrcFormat_${item.id}`"
-            name="setting_basic_control_btn_position" need v-model="current_setting.download.lrcFormat" :value="item.id" :label="item.name")
+            name="setting_download_lrcFormat" need v-model="current_setting.download.lrcFormat" :value="item.id" :label="item.name")
 
       dt#sync {{$t('view.setting.sync')}}
       dd