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
30
                 _clickUser.reset();
30
                 _clickUser.reset();
6
31
                 _clickDB.reset();
31
                 _clickDB.reset();
7
32
32
9
33
                 g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);
33
                 if (_dbus)
10
34
                     g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);
11
34
                 _dbus.reset();
35
                 _dbus.reset();
12
35
             })
36
             })
13
36
    , _registry(registry)
37
    , _registry(registry)
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
Related bugs:	Link a bug report
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
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	30	_clickUser.reset();	30	_clickUser.reset();
6	31	_clickDB.reset();	31	_clickDB.reset();
7	32		32
9	33	g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);	33	if (_dbus)
10			34	g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);
11	34	_dbus.reset();	35	_dbus.reset();
12	35	})	36	})
13	36	, _registry(registry)	37	, _registry(registry)