Merge lp:~3v1n0/unity/shutdown-dialog-nolock-on-lockscreen into lp:unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3992
Proposed branch: lp:~3v1n0/unity/shutdown-dialog-nolock-on-lockscreen
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
shutdown/SessionView.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/shutdown-dialog-nolock-on-lockscreen
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+263449@code.launchpad.net

Commit message

SessionView: don't show Lock button if session is currently locked

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shutdown/SessionView.cpp'
2--- shutdown/SessionView.cpp 2014-06-18 15:08:33 +0000
3+++ shutdown/SessionView.cpp 2015-07-01 01:38:40 +0000
4@@ -236,7 +236,7 @@
5 {
6 if (mode() == Mode::FULL)
7 {
8- if (manager_->CanLock())
9+ if (manager_->CanLock() && !manager_->is_locked())
10 {
11 auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
12 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));