From 7149d0d43fbbae3f009479b17a965ac4db8721d1 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Tue, 11 Apr 2023 14:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=BC=B9=E5=87=BA=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                         | 1 +
 src/renderer/components/layout/PactModal.vue | 6 ++++--
 src/renderer/core/useApp/index.ts            | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 84906383..322b36b8 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -4,6 +4,7 @@
 - 启用桌面歌词时，取消对歌词窗口的聚焦
 - 增加kg歌单歌曲flac24bit显示（@helloplhm-qwq）
 - 增加tx源热门评论图片显示（@Folltoshe）
+- 优化更新弹窗弹出时机
 
 ### 修复
 
diff --git a/src/renderer/components/layout/PactModal.vue b/src/renderer/components/layout/PactModal.vue
index 86230ecc..9e67eb09 100644
--- a/src/renderer/components/layout/PactModal.vue
+++ b/src/renderer/components/layout/PactModal.vue
@@ -18,14 +18,14 @@
       </div>
       <div v-if="!isAgreePact" :class="$style.btns">
         <base-btn :class="$style.btn" @click="handleClose(true)">{{ $t('not_agree') }}</base-btn>
-        <base-btn :class="$style.btn" :disabled="!btnEnable" @click="handleClick()">{{ $t('agree') }} {{ timeStr }}</base-btn>
+        <base-btn :class="$style.btn" :disabled="!btnEnable" @click="handleClick">{{ $t('agree') }} {{ timeStr }}</base-btn>
       </div>
     </main>
   </material-modal>
 </template>
 
 <script>
-import { quitApp } from '@renderer/utils/ipc'
+import { checkUpdate, quitApp } from '@renderer/utils/ipc'
 import { openUrl } from '@common/utils/electron'
 import { isShowPact } from '@renderer/store'
 import { appSetting, saveAgreePact } from '@renderer/store/setting'
@@ -75,6 +75,8 @@ export default {
         this.$dialog({
           message: Buffer.from('e69cace8bdafe4bbb6e5ae8ce585a8e5858de8b4b9e4b894e5bc80e6ba90efbc8ce5a682e69e9ce4bda0e698afe88ab1e992b1e8b4ade4b9b0e79a84efbc8ce8afb7e79bb4e68ea5e7bb99e5b7aee8af84efbc810a0a5468697320736f667477617265206973206672656520616e64206f70656e20736f757263652e', 'hex').toString(),
           confirmButtonText: Buffer.from('e5a5bde79a8420284f4b29', 'hex').toString(),
+        }).then(() => {
+          checkUpdate()
         })
       }, 2e3)
     },
diff --git a/src/renderer/core/useApp/index.ts b/src/renderer/core/useApp/index.ts
index cd8ddf69..1de73715 100644
--- a/src/renderer/core/useApp/index.ts
+++ b/src/renderer/core/useApp/index.ts
@@ -67,7 +67,7 @@ export default () => {
       sendInited()
 
       handleListAutoUpdate()
-      if (window.lx.isProd) checkUpdate()
+      if (window.lx.isProd && appSetting['common.isAgreePact']) checkUpdate()
     })
   })
 }