Merge lp://qastaging/~vanvugt/compiz/fix-1056615 into lp://qastaging/compiz/0.9.9
Proposed by
Daniel van Vugt
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Sam Spilsbury | ||||
| Approved revision: | 3434 | ||||
| Merged at revision: | 3436 | ||||
| Proposed branch: | lp://qastaging/~vanvugt/compiz/fix-1056615 | ||||
| Merge into: | lp://qastaging/compiz/0.9.9 | ||||
| Diff against target: |
11 lines (+1/-1) 1 file modified
compizconfig/integration/gnome/src/ccs_gnome_integration.c (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~vanvugt/compiz/fix-1056615 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sam Spilsbury | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
Don't try to dereference NULL, which is returned by
ccsGConfIntegra
(LP: #1056615)
Description of the change
Sadly the gconf problem triggering this bug is so intermittent that I cannot reproduce it since adding debugging details to bug 1056615. So I'm not sure how or why gconf_client_get randomly returns an unexpected type.
I am however very confident that this fixes the crash.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Sam Spilsbury (smspillaz) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:3434
http://
Executed test runs:
FAILURE: http://