simplified security products: don't log guids, remove duplicate entries

2 files changed, 12 insertions, 9 deletions

diff --git a/src/env.cpp b/src/env.cpp
index a23e65a4..b3f9525f 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -157,8 +157,18 @@ void Environment::dump(const Settings& s) const
   }
 
   log::debug("security products:");
-  for (const auto& sp : securityProducts()) {
-    log::debug("  . {}", sp.toString());
+
+  {
+    // ignore products with identical names, some AVs register themselves with
+    // the same names and provider, but different guids
+    std::set<QString> productNames;
+    for (const auto& sp : securityProducts()) {
+      productNames.insert(sp.toString());
+    }
+
+    for (auto&& name : productNames) {
+      log::debug("  . {}", name);
+    }
   }
 
   log::debug("modules loaded in process:");
diff --git a/src/envsecurity.cpp b/src/envsecurity.cpp
index 6d62728b..87db98ce 100644
--- a/src/envsecurity.cpp
+++ b/src/envsecurity.cpp
@@ -207,13 +207,6 @@ QString SecurityProduct::toString() const
     s += ", definitions outdated";
   }
 
-  // all products have a guid, but the windows firewall is not actually a real
-  // one from wmi, it's queried independently in getWindowsFirewall() and has a
-  // null guid, so just don't log it
-  if (!m_guid.isNull()) {
-    s += ", " + m_guid.toString(QUuid::QUuid::WithoutBraces);
-  }
-
   return s;
 }