fix: [headless] disbale headless if SIGTERM

It cause system blocked when shutdown/logout Log: fix bug
Johnson-zs · Sep 18, 2023 · 2f7640f · 2f7640f
1 parent cc87835
commit 2f7640f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/apps/dde-file-manager/main.cpp b/src/apps/dde-file-manager/main.cpp
@@ -164,9 +164,11 @@ static bool pluginsLoad()
 
 static void handleSIGTERM(int sig)
 {
-    qCritical() << "break with !SIGTERM! " << sig;
+    qWarning() << "break with !SIGTERM! " << sig;
 
     if (qApp) {
+        // Don't use headless if SIGTERM, cause system shutdown blocked
+        qApp->setProperty("SIGTERM", true);
         qApp->quit();
     }
 }
@@ -317,7 +319,8 @@ int main(int argc, char *argv[])
     DPF_NAMESPACE::LifeCycle::shutdownPlugins();
 
     bool enableHeadless { DConfigManager::instance()->value(kDefaultCfgPath, "dfm.headless", false).toBool() };
-    if (enableHeadless && !SysInfoUtils::isOpenAsAdmin()) {
+    bool isSigterm { qApp->property("SIGTERM").toBool() };
+    if (!isSigterm && enableHeadless && !SysInfoUtils::isOpenAsAdmin()) {
         a.closeServer();
         QProcess::startDetached(QString("%1 -d").arg(QString(argv[0])));
     }