fix: prevent treeland exit by ctrl+c

Signed-off-by: ComixHe <[email protected]>
linuxdeepin · Jan 16, 2024 · 690b8c1 · 690b8c1
1 parent b5c6b0b
commit 690b8c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
@@ -54,10 +54,8 @@ namespace SDDM {
             , m_session(new UserSession(this))
             , m_socket(new QLocalSocket(this)) {
         qInstallMessageHandler(HelperMessageHandler);
+        //TODO: replace this workaround in the future
         SignalHandler *s = new SignalHandler(this);
-        QObject::connect(s, &SignalHandler::sigtermReceived, m_session, [] {
-            QCoreApplication::instance()->exit(-1);
-        });
 
         QTimer::singleShot(0, this, SLOT(setUp()));
     }
@@ -130,7 +128,7 @@ namespace SDDM {
             exit(Auth::HELPER_OTHER_ERROR);
             return;
         }
- 
+
         connect(m_socket, &QLocalSocket::connected, this, &HelperApp::doAuth);
         if(!m_backend->identifyOnly()){
             connect(m_session, &UserSession::finished, this, &HelperApp::sessionFinished);
@@ -315,7 +313,6 @@ namespace SDDM {
         Q_ASSERT(getuid() == 0);
 
         m_session->stop();
-
         if(!m_backend->identifyOnly()){
             m_backend->closeSession();
         }

diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
@@ -242,7 +242,7 @@ namespace SDDM {
 
             // take control of the tty
             if (takeControl) {
-                if (ioctl(STDIN_FILENO, TIOCSCTTY) < 0) {
+                if (ioctl(STDIN_FILENO, TIOCSCTTY, 0) < 0) {
                     const auto error = strerror(errno);
                     qCritical().nospace() << "Failed to take control of " << ttyString << " (" << QFileInfo(ttyString).owner() << "): " << error;
                     _exit(Auth::HELPER_TTY_ERROR);

diff --git a/src/treeland/treeland-fake-session/fake-session.cpp b/src/treeland/treeland-fake-session/fake-session.cpp
@@ -5,6 +5,7 @@
 
 #include "shortcutmanager.h"
 #include "Constants.h"
+#include "SignalHandler.h"
 
 #include <QDebug>
 #include <QObject>
@@ -210,6 +211,8 @@ FakeSession::FakeSession(int argc, char* argv[])
     , m_toplevelManager(new Protocols::ForeignToplevelManager)
     , m_extForeignToplevelList(new Protocols::ExtForeignToplevelList)
 {
+    auto *s = new SDDM::SignalHandler(this);
+
     connect(m_shortcutManager, &Protocols::ShortcutManager::activeChanged, this, [this] {
         qDebug() << m_shortcutManager->isActive();