From: Kyle Fuller <redacted>
Date: Tue, 18 Sep 2018 11:59:35 +0000 (+0100)
Subject: Revert "fix: Local notifications may appear twice"
X-Git-Tag: 1.1.2~3
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a8b771eaf134346301ab782fd91aa462e36ad070;p=znc-palaver.git

Revert "fix: Local notifications may appear twice"

This reverts commit e288377a51e314be485acab14fa27e0b79149d0c.
---

diff --git a/palaver.cpp b/palaver.cpp
index a121c22..8bd5a03 100644
--- a/palaver.cpp
+++ b/palaver.cpp
@@ -319,19 +319,6 @@ public:
 		return bHasNetwork;
 	}
 
-	bool IsNetworkConnected(const CIRCNetwork& m_pNetwork) const {
-		bool bIsConnected = false;
-
-		for (CClient* pClient : m_pNetwork.GetClients()) {
-			if (this->HasClient(*pClient)){
-				bIsConnected = true;
-				break;
-			}
-		}
-
-		return bIsConnected;
-	}
-
 	bool AddNetworkNamed(const CString& sUsername, const CString& sNetwork, const CString& sNetworkID) {
 		bool bDidAddNetwork = false;
 
@@ -1080,7 +1067,7 @@ public:
 					continue;
 				}
 
-				if (device.IsNetworkConnected(*m_pNetwork)) {
+				if (device.HasNetwork(*m_pNetwork)) {
 					bool bMention = (
 						((pChannel == NULL) || device.HasMentionChannel(pChannel->GetName())) ||
 						device.HasMentionNick(Nick.GetNick()) ||