From fe24a1fb7fc3e0935131d6557d7585fcd7825f54 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Thu, 19 Mar 2026 06:53:58 +0000 Subject: [PATCH] sync: from linuxdeepin/dde-session-shell Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: https://github.com/linuxdeepin/dde-session-shell/pull/61 --- 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); }