Merge lp://qastaging/~mterry/unity8/fix-greeter-race into lp://qastaging/unity8
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Josh Arenson | ||||
| Approved revision: | 2544 | ||||
| Merged at revision: | 2572 | ||||
| Proposed branch: | lp://qastaging/~mterry/unity8/fix-greeter-race | ||||
| Merge into: | lp://qastaging/unity8 | ||||
| Diff against target: |
31 lines (+9/-3) 1 file modified
qml/Greeter/Greeter.qml (+9/-3) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mterry/unity8/fix-greeter-race | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Josh Arenson | Approve | ||
| Unity8 CI Bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
Fix lockscreen appearing right after unlocking a locked session on the desktop.
Description of the change
We were having a race between handling the "please lock yourself" and the "please unlock yourself" requests from logind.
Specifically, while handling the lock request, we would start a new authentication with lightdm. This involved talking to PAM and doing some thread work and processing some events. Which meant that we could process a dbus request to unlock in the middle of the forceShow() method.
At the end of that method, we show the greeter.
So I've added a guard to make sure that at the end of forceShow, we still should be showing the greeter.
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA
* If you changed the UI, has there been a design review?
NA
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| Michael Terry (mterry) wrote | # |
Is that an actual atomic operation or does it just make the race _nearly_ impossible?