Skip to content

fix: Fix Xwayland not started after crash recover & switch user #49

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
zccrs merged 1 commit into from
Nov 27, 2025
Merged

fix: Fix Xwayland not started after crash recover & switch user #49

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
29 changes: 15 additions & 14 deletions src/daemon/Display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,16 +225,8 @@ namespace DDM {
m_greeter->setUserActivated(false);
}

Auth *auth = nullptr;

for (auto *a : m_auths) {
if (a->user() == user) {
auth = a;
break;
}
}

if (!auth) {
if (xdgSessionId <= 0) {
qFatal() << "Invalid xdg session id" << xdgSessionId << "for user" << user;
return;
}

Expand All @@ -243,7 +235,7 @@ namespace DDM {

if (Logind::isAvailable()) {
OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus());
manager.ActivateSession(QString::number(auth->xdgSessionId()));
manager.ActivateSession(QString::number(xdgSessionId));
}
}

Expand Down Expand Up @@ -637,16 +629,25 @@ namespace DDM {
stateConfig.Last.Session.setDefault();
stateConfig.save();

if (auth->isSingleMode()) {
if (auth->identifyOnly()) {
auto* server = reinterpret_cast<SingleWaylandDisplayServer*>(m_displayServer);
server->onLoginSucceeded(user);
// TODO: Use exact ID when there're multiple sessions for a user
int xdgSessionId = 0;
for (auto *auth : m_auths)
if (auth->user() == user && auth->xdgSessionId() > 0) {
xdgSessionId = auth->xdgSessionId();
break;
}
switchToUser(user, xdgSessionId);
} else if (auth->isSingleMode()) {
auto* server = reinterpret_cast<SingleWaylandDisplayServer*>(m_displayServer);
server->onLoginSucceeded(user);
} else {
if (m_socket) {
emit loginSucceeded(m_socket, user);
daemonApp->displayManager()->setLastSession(auth->sessionId());
}
if (auth->identifyOnly())
return;

// Stop the original suit of displayServer since it has finished its job.
disconnect(m_displayServer, &DisplayServer::stopped, this, &Display::stop);
Expand Down