From 3bd444dfb7f4a68d79b5e47f7d13e7238cbf55d4 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Tue, 26 Feb 2019 01:51:07 +0000
Subject: [PATCH] Issue #15 Style

---
 src/blackmisc/dbusserver.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp
index 85de36b3d..65d085519 100644
--- a/src/blackmisc/dbusserver.cpp
+++ b/src/blackmisc/dbusserver.cpp
@@ -276,7 +276,7 @@ namespace BlackMisc
             }
             break;
         default:
-            Q_ASSERT_X(false, "CDBusServer::addObject", "Wrong server mode");
+            Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong server mode");
         }
     }
 
@@ -298,7 +298,6 @@ namespace BlackMisc
 
     void CDBusServer::removeAllObjects()
     {
-        if (m_objects.isEmpty()) { return; }
         for (const QString &path : makeKeysRange(as_const(m_objects)))
         {
             switch (m_serverMode)
@@ -310,13 +309,11 @@ namespace BlackMisc
                 QDBusConnection::systemBus().unregisterObject(path);
                 break;
             case SERVERMODE_P2P:
+                for (QDBusConnection connection : as_const(m_connections))
                 {
-                    for (QDBusConnection connection : as_const(m_connections))
-                    {
-                        connection.unregisterObject(path);
-                    }
-                    break;
+                    connection.unregisterObject(path);
                 }
+                break;
             }
         }
         m_objects.clear();