Skip to content

fix(shortcut): skip ddm default session when counting display sessions #92

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

Open
yixinshark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(shortcut): skip ddm default session when counting display sessions #92

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
20 changes: 19 additions & 1 deletion src/plugin-qt/shortcut/tools/dde-shortcut-tool/powercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,25 @@ bool PowerController::hasMultipleDisplaySession()
QVariant v = displayMgr.property("Sessions");
if (!v.isValid())
return false;
return qdbus_cast<QList<QDBusObjectPath>>(v).size() >= 2;

const QList<QDBusObjectPath> sessions = qdbus_cast<QList<QDBusObjectPath>>(v);
if (!isWaylandSession())
return sessions.size() >= 2;

// On Treeland the default display manager (ddm) keeps a default session(dde)
int userSessions = 0;
for (const QDBusObjectPath &path : sessions) {
QDBusInterface session("org.freedesktop.DisplayManager", path.path(),
"org.freedesktop.DisplayManager.Session",
QDBusConnection::systemBus());
if (!session.isValid())
continue;
Comment thread
yixinshark marked this conversation as resolved.
if (session.property("UserName").toString() == QLatin1String("dde"))
continue;
++userSessions;
}

return userSessions >= 2;
}

void PowerController::doPrepareSuspend()
Expand Down
Loading