Merge lp:~ted/ubuntu-app-launch/no-sync-on-null into lp:ubuntu-app-launch/16.04

Proposed by Ted Gould on 2016-05-03
Status: Merged
Approved by: Larry Price on 2016-05-03
Approved revision: 220
Merged at revision: 226
Proposed branch: lp:~ted/ubuntu-app-launch/no-sync-on-null
Merge into: lp:ubuntu-app-launch/16.04
Diff against target: 13 lines (+2/-1)
1 file modified
libubuntu-app-launch/registry-impl.cpp (+2/-1)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/no-sync-on-null
Reviewer Review Type Date Requested Status
Larry Price 2016-05-03 Approve on 2016-05-03
PS Jenkins bot (community) continuous-integration Approve on 2016-05-03
Review via email: mp+293582@code.launchpad.net

Commit message

Minor cleanup which causes an annoying warning message

Description of the change

Annoying

To post a comment you must log in.
Larry Price (larryprice) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntu-app-launch/registry-impl.cpp'
2--- libubuntu-app-launch/registry-impl.cpp 2016-03-03 20:48:24 +0000
3+++ libubuntu-app-launch/registry-impl.cpp 2016-05-03 02:41:43 +0000
4@@ -30,7 +30,8 @@
5 _clickUser.reset();
6 _clickDB.reset();
7
8- g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);
9+ if (_dbus)
10+ g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);
11 _dbus.reset();
12 })
13 , _registry(registry)

Subscribers

People subscribed via source and target branches