Merge lp:~azzar1/unity/lp-1460626 into lp:unity

Proposed by Andrea Azzarone on 2015-06-19
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2015-08-17
Approved revision: 3973
Merged at revision: 4002
Proposed branch: lp:~azzar1/unity/lp-1460626
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
UnityCore/GnomeSessionManager.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1460626
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2015-06-19 Approve on 2015-08-17
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-06-19
Review via email: mp+262443@code.launchpad.net

Commit message

Do not allow shutdown when screen is locked.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/GnomeSessionManager.cpp'
2--- UnityCore/GnomeSessionManager.cpp 2015-01-24 00:56:37 +0000
3+++ UnityCore/GnomeSessionManager.cpp 2015-06-19 12:48:33 +0000
4@@ -679,7 +679,7 @@
5
6 bool GnomeManager::CanShutdown() const
7 {
8- return impl_->can_shutdown_;
9+ return !is_locked() && impl_->can_shutdown_;
10 }
11
12 bool GnomeManager::CanSuspend() const