Skip to content

Commit dfd54f8

Browse files
deepin-ci-robotyixinshark
authored andcommitted
sync: from linuxdeepin/dde-session-shell
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#61
1 parent a3dc1ab commit dfd54f8

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/widgets/warningcontent.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2015 - 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2015 - 2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -205,8 +205,7 @@ void WarningContent::doAcceptShutdownInhibit()
205205
&& m_model->currentModeState() != SessionBaseModel::ModeStatus::PowerMode
206206
&& m_powerAction != SessionBaseModel::RequireUpdateShutdown
207207
&& m_powerAction != SessionBaseModel::RequireUpdateRestart
208-
&& m_powerAction != SessionBaseModel::RequireShutdown
209-
&& m_powerAction != SessionBaseModel::RequireRestart ) {
208+
&& ((m_powerAction == SessionBaseModel::RequireShutdown || m_powerAction == SessionBaseModel::RequireRestart) && m_model->gsCheckpwd())) {
210209
FullScreenBackground::setContent(LockContent::instance());
211210
m_model->setCurrentContentType(SessionBaseModel::LockContent);
212211
}

0 commit comments

Comments
 (0)