Skip to content

fix: dde-blackwidget收到kill信号后直接退出,解决重新时卡logo的问题 #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fly602 merged 1 commit into from
May 8, 2025
Merged

fix: dde-blackwidget收到kill信号后直接退出,解决重新时卡logo的问题 #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions dde-blackwidget/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,9 @@ void handleSIGTERM(int signal) {
if (QCoreApplication::closingDown())
return;
qInfo() << "handleSIGTERM: " << signal;

bool bShutdown = onPreparingForShutdown();
qInfo() << "Whether preparing for shutdown: " << bShutdown;
if (bShutdown) {
QTimer::singleShot(2500, qApp, SLOT(quit()));
} else {
QTimer time;
time.start(1000);
QObject::connect(&time, &QTimer::timeout, [&] {
bool bShutdown = onPreparingForShutdown();
qInfo() << "Whether preparing for shutdown: " << bShutdown;
if (bShutdown) {
time.stop();
QTimer::singleShot(2000, qApp, SLOT(quit()));
return;
} else {
qInfo() << " Get org.freedesktop.login1.Manager PreparingForShutdown again.";
}
});
}
// 信号处理会阻塞进程，dbus调用也会被阻塞，因此等待一会自动退出吧
// 这个等待时间已经够长了，足够显示关机界面了，如果还有显示问题，应该从其他地方查找问题来优化。
QTimer::singleShot(2500, qApp, SLOT(quit()));
}

int main(int argc, char *argv[])
Expand Down
Loading