Revert "fix: Local notifications may appear twice"
authorKyle Fuller <redacted>
Tue, 18 Sep 2018 11:59:35 +0000 (12:59 +0100)
committerKyle Fuller <redacted>
Tue, 18 Sep 2018 11:59:35 +0000 (12:59 +0100)
This reverts commit e288377a51e314be485acab14fa27e0b79149d0c.

palaver.cpp

index a121c22dd7226b852392c4455bdbbe225fc2b9bd..8bd5a0394ae0f7ba9f4030b68bdef83dc51a85f1 100644 (file)
@@ -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()) ||
git clone https://git.99rst.org/PROJECT