diff options
| author | Andrea Azzarone andrea.azzarone@canonical.com <> | 2015-06-19 14:45:11 +0200 |
|---|---|---|
| committer | Andrea Azzarone andrea.azzarone@canonical.com <> | 2015-06-19 14:45:11 +0200 |
| commit | 9c804a81e8f2355663eeb0620a81b1e15d398739 (patch) | |
| tree | 533c9a04445caa2b3474241b270d18b5926bf0b2 /UnityCore | |
| parent | b1137885d121d4ed9b8cd9f08ca977662df79343 (diff) | |
Do not allow shutdown when screen is locked.
Fixes LP: #1460626 (bzr r3972.4.1)
Diffstat (limited to 'UnityCore')
| -rw-r--r-- | UnityCore/GnomeSessionManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/UnityCore/GnomeSessionManager.cpp b/UnityCore/GnomeSessionManager.cpp index 8ecff4d36..bd89b3e6a 100644 --- a/UnityCore/GnomeSessionManager.cpp +++ b/UnityCore/GnomeSessionManager.cpp @@ -679,7 +679,7 @@ bool GnomeManager::CanLock() const bool GnomeManager::CanShutdown() const { - return impl_->can_shutdown_; + return !is_locked() && impl_->can_shutdown_; } bool GnomeManager::CanSuspend() const |