Merge lp:~laney/ubuntu-system-settings/lp1375988 into lp:ubuntu-system-settings
Proposed by
Iain Lane
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sebastien Bacher | ||||
Approved revision: | 1104 | ||||
Merged at revision: | 1108 | ||||
Proposed branch: | lp:~laney/ubuntu-system-settings/lp1375988 | ||||
Merge into: | lp:ubuntu-system-settings | ||||
Diff against target: |
116 lines (+20/-26) 1 file modified
plugins/about/storageabout.cpp (+20/-26) |
||||
To merge this branch: | bzr merge lp:~laney/ubuntu-system-settings/lp1375988 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Sebastien Bacher (community) | Approve | ||
Review via email:
|
Commit message
[storage/about] Use a QSharedPointer to manage freeing of the counter which we use to display all of the collected sizes at once. If the measuring process was cancelled, we were freeing it multiple times - once for each outstanding size measurement. This led to a crash.
Description of the change
Use a QSharedPointer to properly manage the shared counter.
We were freeing it multiple times if the space measuring was cancelled.
To post a comment you must log in.
Thanks, that seems to do the trick