Merge lp://staging/~osomon/oxide/prevent-concurrent-power-save-blocks into lp://staging/~oxide-developers/oxide/oxide.trunk
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Merged at revision: | 1220 |
Proposed branch: | lp://staging/~osomon/oxide/prevent-concurrent-power-save-blocks |
Merge into: | lp://staging/~oxide-developers/oxide/oxide.trunk |
Diff against target: |
40 lines (+11/-5) 1 file modified
shared/browser/oxide_power_save_blocker.cc (+11/-5) |
To merge this branch: | bzr merge lp://staging/~osomon/oxide/prevent-concurrent-power-save-blocks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Coulson | Approve | ||
Review via email: mp+274675@code.staging.launchpad.net |
Commit message
Ensure that a power save block cannot be issued twice in a row.
To post a comment you must log in.
I've left a comment inline. Also, there's a thread-safety issue with the current implementation which probably should be addressed here - unity_cookie_ is read on the UI thread and written on the file thread with no locking. The access on the UI thread should probably just be removed.