Merge lp:~azzar1/unity/fix-1308572 into lp:unity

Proposed by Andrea Azzarone on 2014-04-16
Status: Merged
Approved by: Brandon Schaefer on 2014-04-16
Approved revision: 3788
Merged at revision: 3787
Proposed branch: lp:~azzar1/unity/fix-1308572
Merge into: lp:unity
Diff against target: 23 lines (+5/-1)
1 file modified
lockscreen/UserPromptView.cpp (+5/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1308572
Reviewer Review Type Date Requested Status
Robert Ancell Approve on 2014-04-16
PS Jenkins bot continuous-integration Needs Fixing on 2014-04-16
Brandon Schaefer (community) 2014-04-16 Approve on 2014-04-16
Review via email: mp+216216@code.launchpad.net

Commit message

Do not allow to activate twice the same entry!

Description of the change

Do not allow to activate twice the same entry. Damn you nux!!

To post a comment you must log in.
lp:~azzar1/unity/fix-1308572 updated on 2014-04-16
3787. By Andrea Azzarone on 2014-04-16

Fix ident.

3788. By Andrea Azzarone on 2014-04-16

Minor change.

Brandon Schaefer (brandontschaefer) wrote :

Nice, fixes crash for me!

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Robert Ancell (robert-ancell) wrote :

Confirmed fixed here doing a full package build from this branch.
unity 7.2.0+14.04.20140414.1-0ubuntu1 crashes in approximately 10s by holding down enter in the lock screen. After crash session is unlocked.

Tested this branch for over a minute with no crashes occuring.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lockscreen/UserPromptView.cpp'
2--- lockscreen/UserPromptView.cpp 2014-04-01 19:05:07 +0000
3+++ lockscreen/UserPromptView.cpp 2014-04-16 21:34:37 +0000
4@@ -348,6 +348,11 @@
5 nux::GetWindowCompositor().SetKeyFocusArea(text_entry);
6
7 text_entry->activated.connect([this, text_input, promise](){
8+ auto* text_entry = text_input->text_entry();
9+
10+ if (!text_entry->GetInputEventSensitivity())
11+ return;
12+
13 if (focus_queue_.size() == 1)
14 {
15 text_input->SetSpinnerVisible(true);
16@@ -355,7 +360,6 @@
17 }
18
19 focus_queue_.pop_front();
20- auto* text_entry = text_input->text_entry();
21 cached_focused_geo_ = text_entry->GetGeometry();
22 text_entry->SetInputEventSensitivity(false);
23 QueueRelayout();