Skip to content

fix: restore the power mode from the active session only #236

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
fly602 merged 1 commit into from
Oct 15, 2026
Merged

fix: restore the power mode from the active session only #236

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
31 changes: 19 additions & 12 deletions src/dde-session/impl/sessionmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,16 @@ void SessionManager::initConnections()
connect(m_login1ManagerInter, &org::freedesktop::login1::Manager::PrepareForSleep, [=](bool sleep) {
qDebug() << "system is preparing for sleep: " << sleep;
if (!sleep) {
// 唤醒后恢复之前的电源模式
// 唤醒后恢复之前的电源模式；只有活动会话才会真正写入
recoverySystemPowerMode();
}
});

connect(m_login1SessionInter, &org::freedesktop::login1::Session::ActiveChanged, [=](bool active) {
qDebug() << "session active status changed to:" << active;
if (active) {
// 变活跃
// 变为活动会话：恢复唤醒时未能处理的电源模式
recoverySystemPowerMode();
} else {
// 变不活跃
bool isPreparingForSleep = m_login1ManagerInter->preparingForSleep();
Expand Down Expand Up @@ -866,6 +867,10 @@ void SessionManager::setTlpMode(const QString &mode)

void SessionManager::recoverySystemPowerMode()
{
// 电源模式是系统级的，只有活动会话可以恢复，否则会与活动会话冲突
if (!m_login1SessionInter->active())
return;

qInfo() << "recoverySystemPowerMode";
QDBusInterface inter("org.deepin.dde.Power1", "/org/deepin/dde/Power1",
"org.freedesktop.DBus.Properties", QDBusConnection::systemBus());
Expand Down Expand Up @@ -900,21 +905,23 @@ void SessionManager::recoverySystemPowerMode()
QDBusMessage batteryMsg = inter.call("Get", "org.deepin.dde.Power1", "HasBattery");
if (batteryMsg.type() == QDBusMessage::ReplyMessage) {
bool hasBattery = batteryMsg.arguments().value(0).value<QDBusVariant>().variant().toBool();
if (!hasBattery) {
setTlpMode(mode);
return;
}

QDBusMessage capacityMsg = inter.call("Get", "org.deepin.dde.Power1", "BatteryCapacity");
if (capacityMsg.type() == QDBusMessage::ReplyMessage) {
double batteryCapacity = capacityMsg.arguments().value(0).value<QDBusVariant>().variant().toDouble();
if (batteryCapacity <= 20.0) {
mode = LowBattery;
if (hasBattery) {
QDBusMessage capacityMsg = inter.call("Get", "org.deepin.dde.Power1", "BatteryCapacity");
if (capacityMsg.type() == QDBusMessage::ReplyMessage) {
double batteryCapacity = capacityMsg.arguments().value(0).value<QDBusVariant>().variant().toDouble();
if (batteryCapacity <= 20.0) {
mode = LowBattery;
}
}
}
}
}

if (mode == tlpMode)
return;
// 读取属性期间会话可能已变为非活动，等下次激活时再恢复
if (!m_login1SessionInter->active())
return;
setTlpMode(mode);
}

Expand Down
Loading