Unity HUD

Merge lp:~pete-woods/hud/null-dbusmenucollector into lp:hud/14.04

  1. null-dbusmenucollector
  2. Merge into trunk.14.04
Proposed by Pete Woods
Status: Superseded
Proposed branch: lp:~pete-woods/hud/null-dbusmenucollector
Merge into: lp:hud/14.04
Diff against target: 32 lines (+10/-1)
2 files modified
service/DBusMenuCollector.cpp (+6/-0)
service/WindowImpl.cpp (+4/-1)
To merge this branch: bzr merge lp:~pete-woods/hud/null-dbusmenucollector
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+204732@code.launchpad.net

This proposal has been superseded by a proposal from 2014-02-04.

Commit message

Extra checks for null DBusMenuCollector

Description of the change

Extra checks for null DBusMenuCollector

To post a comment you must log in.
lp:~pete-woods/hud/null-dbusmenucollector updated
365. By Pete Woods

Add null checks for dbusmenucollector

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'service/DBusMenuCollector.cpp'
2--- service/DBusMenuCollector.cpp 2013-11-27 19:12:22 +0000
3+++ service/DBusMenuCollector.cpp 2014-02-04 16:38:02 +0000
4@@ -123,7 +123,13 @@
5 CollectorToken::Ptr collectorToken(m_collectorToken);
6
7 if (collectorToken.isNull()) {
8+ if(!m_menuImporter) {
9+ return CollectorToken::Ptr();
10+ }
11 openMenu(m_menuImporter->menu());
12+ if (!m_menuImporter) {
13+ return CollectorToken::Ptr();
14+ }
15 collectorToken.reset(
16 new CollectorToken(shared_from_this(), m_menuImporter->menu()));
17 m_collectorToken = collectorToken;
18
19=== modified file 'service/WindowImpl.cpp'
20--- service/WindowImpl.cpp 2013-12-19 12:58:11 +0000
21+++ service/WindowImpl.cpp 2014-02-04 16:38:02 +0000
22@@ -94,7 +94,10 @@
23 QList<CollectorToken::Ptr> tokens;
24 for (Collector::Ptr collector : collectors) {
25 if (collector && collector->isValid()) {
26- tokens << collector->activate();
27+ Collector::Ptr token(collector->activate());
28+ if (token) {
29+ tokens << token;
30+ }
31 }
32 }
33

Subscribers

People subscribed via source and target branches