Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复频繁重启系统后任务栏进入安全模式

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

Log:
Influence: 任务栏安全模式
Task: https://pms.uniontech.com/zentao/task-view-97158.html
Change-Id: I5978158d1667e4c24e3cc206bc31bb53eb8f8130
This commit is contained in:
范朋程 2022-01-06 13:29:37 +08:00 committed by fanpengcheng
parent 4c2b4adf30
commit b56b3d3ee2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frame/main.cpp
View File

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