From 609bc7934c28a430461b8e6ef85b38f4d1911f35 Mon Sep 17 00:00:00 2001 From: zhaoyingzhen Date: Thu, 19 Mar 2026 14:47:12 +0800 Subject: [PATCH] fix: display auth window when the password need be checked before shutdown or reboot when the password need be checked before shutdown or reboot, if the lock is showing, need show auth window. Log: display auth window when the password need be checked before shutdown or reboot Pms: BUG-353333 BUG-338545 --- src/widgets/warningcontent.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/widgets/warningcontent.cpp b/src/widgets/warningcontent.cpp index 5030cd07..c9cc3146 100644 --- a/src/widgets/warningcontent.cpp +++ b/src/widgets/warningcontent.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2015 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2015 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -205,8 +205,7 @@ void WarningContent::doAcceptShutdownInhibit() && m_model->currentModeState() != SessionBaseModel::ModeStatus::PowerMode && m_powerAction != SessionBaseModel::RequireUpdateShutdown && m_powerAction != SessionBaseModel::RequireUpdateRestart - && m_powerAction != SessionBaseModel::RequireShutdown - && m_powerAction != SessionBaseModel::RequireRestart ) { + && ((m_powerAction == SessionBaseModel::RequireShutdown || m_powerAction == SessionBaseModel::RequireRestart) && m_model->gsCheckpwd())) { FullScreenBackground::setContent(LockContent::instance()); m_model->setCurrentContentType(SessionBaseModel::LockContent); }