Merge lp:~townsend/unity/fix-lp926979-trusty into lp:unity/7.2

[Christopher Townsend]

Make sure scope_views_[filter.id] exists before using operator[] on it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/6/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-07-24 14:03:10 +0000
+++ dash/DashView.cpp	2015-05-15 19:53:47 +0000
@@ -1174,7 +1174,9 @@
 
   if (!filter.filters.empty())
   {
-    scope_views_[filter.id]->filters_expanded = true;
+    if (scope_views_.find(filter.id) != std::end(scope_views_))
+      scope_views_[filter.id]->filters_expanded = true;
+
     // update the scope for each filter
     for (auto p : filter.filters) {
       UpdateScopeFilter(filter.id, p.first, p.second);