diff options
| author | Andrea Azzarone andrea.azzarone@canonical.com <> | 2015-09-10 15:37:07 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-09-10 15:37:07 +0000 |
| commit | 562bea404b5b82d1eca9d95f23d57a9d06c76383 (patch) | |
| tree | 2cb9543b37cd2e039912ba2891d2e5068d5976dd /UnityCore | |
| parent | fc4c5de1362b963e2e529544ae17ffda987f1e7f (diff) | |
| parent | 9c804a81e8f2355663eeb0620a81b1e15d398739 (diff) | |
Do not allow shutdown when screen is locked. Fixes: #1460626
Approved by: Marco Trevisan (Treviño) (bzr r4002)
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 2e4c43432..0702b9433 100644 --- a/UnityCore/GnomeSessionManager.cpp +++ b/UnityCore/GnomeSessionManager.cpp @@ -684,7 +684,7 @@ bool GnomeManager::CanLock() const bool GnomeManager::CanShutdown() const { - return impl_->can_shutdown_; + return !is_locked() && impl_->can_shutdown_; } bool GnomeManager::CanSuspend() const |