Merge pull request #1478 from sddm/work/wayland-and-x11

Fix login of Wayland sessions with root Xorg
sddm · Nov 29, 2021 · 0424283 · 0424283
2 parents e8e2a0f + d5b101a
commit 0424283
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
@@ -358,6 +358,12 @@ namespace SDDM {
         // last session later, in slotAuthenticationFinished()
         m_sessionName = session.fileName();
 
+        if (session.type() == Session::WaylandSession && m_displayServerType == X11DisplayServerType) {
+            // If it's an X11 display server, we'll have an (idling) Xorg process where
+            // m_terminalId is right now, we need to find another VT
+            m_terminalId = VirtualTerminal::setUpNewVt();
+        }
+
         // some information
         qDebug() << "Session" << m_sessionName << "selected, command:" << session.exec() << "for VT" << m_terminalId;