Commit 15365bbb authored by Guillaume Roguez's avatar Guillaume Roguez

dbus: fix dbus instances destruction order at exit

This patchset fixes a segmentation fault at normal program exit.

Refs #65931

Change-Id: Ie8299c612515d92f9b341f2503fd617e0850b7e7
parent 01fd555e
......@@ -109,7 +109,17 @@ DBusClient::DBusClient(int sflphFlags, bool persistent)
DBusClient::~DBusClient()
{
dispatcher_.reset(); // force dispatcher reset first
// instances destruction order is important
// so we enforce it here
#ifdef RING_VIDEO
videoManager_.reset();
#endif
instanceManager_.reset();
presenceManager_.reset();
configurationManager_.reset();
callManager_.reset();
timeout_.reset();
}
int DBusClient::initLibrary(int sflphFlags)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment