From b56b3d3ee21f121df3d76be9797747b117b0f94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= <fanpengcheng@uniontech.com>
Date: Thu, 6 Jan 2022 13:29:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=91=E7=B9=81?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E7=B3=BB=E7=BB=9F=E5=90=8E=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=8F=E8=BF=9B=E5=85=A5=E5=AE=89=E5=85=A8=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

任务栏安全模式判断条件改成3秒内再次启动认为上次为异常退出

Log:
Influence: 任务栏安全模式
Task: https://pms.uniontech.com/zentao/task-view-97158.html
Change-Id: I5978158d1667e4c24e3cc206bc31bb53eb8f8130
---
 frame/main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frame/main.cpp b/frame/main.cpp
index 6863f19ca..e19a8a12a 100644
--- a/frame/main.cpp
+++ b/frame/main.cpp
@@ -84,14 +84,13 @@ void record_start(const QString &configPath)
     const QString &currentTime = QDateTime::currentDateTime().toString(timeFormat);
 
     int collapseNum = settings.value("collapse").toInt();
-    /* 第一次崩溃或进入安全模式后的第一次崩溃，将时间重置 */
     if (collapseNum == 0) {
         settings.setValue("first_time", currentTime);
     }
     QDateTime lastDate = QDateTime::fromString(settings.value("first_time").toString(), timeFormat);
 
-    /* 将当前崩溃时间与第一次崩溃时间比较，小于9分钟，记录一次崩溃；大于9分钟，覆盖之前的崩溃时间 */
-    if (qAbs(lastDate.secsTo(QDateTime::currentDateTime())) < 9 * 60) {
+    /* 两次启动时间相差3秒,认为是异常退出,不在崩溃时做处理,防止异常 */
+    if (qAbs(lastDate.secsTo(QDateTime::currentDateTime())) < 3) {
         settings.setValue("collapse", collapseNum + 1);
         switch (collapseNum) {
         case 0: