Skip to content

fix(treeland): activate session before unlocking #103

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

Draft
zorowk wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(treeland): activate session before unlocking #103

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
11 changes: 7 additions & 4 deletions src/daemon/Display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,14 @@ namespace DDM {
OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(),
Logind::managerPath(),
QDBusConnection::systemBus());
manager.UnlockSession(QString::number(auth->xdgSessionId));
if (auth->type == Treeland)
if (auth->type == Treeland) {
activateSession(user, auth->xdgSessionId);
else if (!daemonApp->seatdControl()->requestSwitchVt(auth->tty))
qWarning() << "Failed to switch to session VT" << auth->tty << "for user" << user;
manager.UnlockSession(QString::number(auth->xdgSessionId));
} else {
manager.UnlockSession(QString::number(auth->xdgSessionId));
if (!daemonApp->seatdControl()->requestSwitchVt(auth->tty))
qWarning() << "Failed to switch to session VT" << auth->tty << "for user" << user;
}
qInfo() << "Successfully identified user" << user;
return;
}
Expand Down
Loading