diff --git a/src/session-widgets/sessionbasemodel.cpp b/src/session-widgets/sessionbasemodel.cpp index d323ac16..1dd53212 100644 --- a/src/session-widgets/sessionbasemodel.cpp +++ b/src/session-widgets/sessionbasemodel.cpp @@ -3,13 +3,13 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "sessionbasemodel.h" +#include "dconfig_helper.h" +#include "dbus/dbusdisplaymanager.h" #include - #include #include "dbusconstant.h" -#include "dconfig_helper.h" DCORE_USE_NAMESPACE @@ -462,6 +462,22 @@ void SessionBaseModel::updateUserList(const QStringList &list) void SessionBaseModel::updateLoginedUserList(const QString &list) { qCDebug(DDE_SHELL) << "Logined user list: " << list; + // kwin崩溃时systemd中的sessions不会被remove掉,这里通过DisplayManager的session信息过滤一遍(临时解决方案) + QStringList loggedUserNameList; + DBusDisplayManager displayManager("org.freedesktop.DisplayManager", "/org/freedesktop/DisplayManager", QDBusConnection::systemBus()); + const auto &sessions = displayManager.sessions(); + for (const auto &session : sessions) { + const QString &sessionPath = session.path(); + if (sessionPath.isEmpty()) + continue; + QDBusInterface interface("org.freedesktop.DisplayManager", sessionPath, "org.freedesktop.DisplayManager.Session", QDBusConnection::systemBus()); + if (interface.isValid()) { + const QString &userName = interface.property("UserName").toString(); + if (!userName.isEmpty()) + loggedUserNameList.append(userName); + } + } + qInfo(DDE_SHELL) << "Logined users from display manager: " << loggedUserNameList; QList loginedUsersTmp = m_loginedUsers->keys(); QJsonParseError jsonParseError; @@ -486,8 +502,11 @@ void SessionBaseModel::updateLoginedUserList(const QString &list) // 对于通过自定义窗口输入的账户(域账户), 此时账户还没添加进来,导致下面m_users->value(path)为空指针,调用会导致程序奔溃 // 因此在登录时,对于新增的账户,调用addUser先将账户添加进来,然后再去更新对应账户的登录状态 addUser(path); - m_loginedUsers->insert(path, m_users->value(path)); - m_users->value(path)->updateLoginState(true); + auto user = m_users->value(path); + if (user->name().isEmpty() || loggedUserNameList.contains(user->name())) { + m_loginedUsers->insert(path, user); + user->updateLoginState(true); + } } else { loginedUsersTmp.removeAll(path); }