Unity

Merge lp:~unity-team/unity/unity.fix-761211 into lp:unity

  1. unity.fix-761211
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1159
Proposed branch: lp:~unity-team/unity/unity.fix-761211
Merge into: lp:unity
Diff against target: 22 lines (+6/-2)
1 file modified
src/PlacesResultsController.cpp (+6/-2)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-761211
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+58240@code.launchpad.net

Description of the change

Since the available stacktraces aren't too telling, this is the best attempt to fix LP: #761211 by adding pointer-checks before using any member-methods.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PlacesResultsController.cpp'
2--- src/PlacesResultsController.cpp 2011-04-05 17:18:06 +0000
3+++ src/PlacesResultsController.cpp 2011-04-19 08:31:19 +0000
4@@ -106,12 +106,16 @@
5 std::map <const void *, PlacesGroupController *>::iterator it, eit = _id_to_group.end ();
6
7 for (it = _id_to_group.begin (); it != eit; ++it)
8- (it->second)->UnReference ();
9+ {
10+ if (it->second)
11+ (it->second)->UnReference ();
12+ }
13
14 _id_to_group.erase (_id_to_group.begin (), _id_to_group.end ());
15 _groups.erase (_groups.begin (), _groups.end ());
16
17- _results_view->Clear ();
18+ if (_results_view)
19+ _results_view->Clear ();
20 }
21
22 bool