properly deregister DBusObjectManager

2 files changed, 9 insertions, 0 deletions

diff --git a/src/CommonAPI/DBus/DBusObjectManager.cpp b/src/CommonAPI/DBus/DBusObjectManager.cpp
index 8f05dda..fcfa9f8 100644
--- a/src/CommonAPI/DBus/DBusObjectManager.cpp
+++ b/src/CommonAPI/DBus/DBusObjectManager.cpp
@@ -27,6 +27,14 @@ DBusObjectManager::DBusObjectManager(const std::shared_ptr<DBusProxyConnection>&
     dbusConnection->registerObjectPath("/");
 }
 
+DBusObjectManager::~DBusObjectManager() {
+    std::shared_ptr<DBusProxyConnection> dbusConnection = dbusConnection_.lock();
+    if (dbusConnection) {
+        dbusConnection->unregisterObjectPath("/");
+        dbusConnection->setObjectPathMessageHandler(DBusProxyConnection::DBusObjectPathMessageHandler());
+    }
+}
+
 DBusInterfaceHandlerToken DBusObjectManager::registerDBusStubAdapter(const std::string& objectPath,
                                                                      const std::string& interfaceName,
                                                                      DBusStubAdapter* dbusStubAdapter) {
diff --git a/src/CommonAPI/DBus/DBusObjectManager.h b/src/CommonAPI/DBus/DBusObjectManager.h
index 6d6dff9..cb60948 100644
--- a/src/CommonAPI/DBus/DBusObjectManager.h
+++ b/src/CommonAPI/DBus/DBusObjectManager.h
@@ -22,6 +22,7 @@ class DBusStubAdapter;
 class DBusObjectManager {
  public:
     DBusObjectManager(const std::shared_ptr<DBusProxyConnection>&);
+    ~DBusObjectManager();
 
     void init();