Merge lp:~stolowski/unity-scopes-shell/fix-current-nav-id into lp:unity-scopes-shell
Proposed by
Paweł Stołowski
Status: | Merged |
---|---|
Approved by: | Pete Woods |
Approved revision: | 179 |
Merged at revision: | 178 |
Proposed branch: | lp:~stolowski/unity-scopes-shell/fix-current-nav-id |
Merge into: | lp:unity-scopes-shell |
Diff against target: |
156 lines (+55/-37) 2 files modified
src/Unity/scope.cpp (+54/-36) src/Unity/scope.h (+1/-1) |
To merge this branch: | bzr merge lp:~stolowski/unity-scopes-shell/fix-current-nav-id |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pete Woods (community) | Approve | ||
Marcus Tomlinson (community) | Needs Information | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Don't conclude too early that current department id should be reset.
Description of the change
Don't conclude too early that current department id should be reset.
The flushUpdates() method gets called when search query finishes, but may also get called earlier (if scope is slow - plugin has a timer for that) to push whatever has been received so far. This method also resets the id of current deparment if departments have not been received and current department id is not empty.
This fix changes flushUpdates to only consider resetting current department id if the query has finished or departments have been received.
To post a comment you must log in.
PASSED: Continuous integration, rev:179 jenkins. qa.ubuntu. com/job/ unity-scopes- shell-ci/ 268/ jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- amd64-ci/ 10 jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- armhf-ci/ 10 jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- armhf-ci/ 10/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- i386-ci/ 10
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scopes- shell-ci/ 268/rebuild
http://