From 4c33f7947b71c4fb7924c7c4df3bec4a7528bd15 Mon Sep 17 00:00:00 2001 From: prozacx Date: Tue, 27 Sep 2005 00:51:00 +0000 Subject: [PATCH] Moved some FindChan() calls to below module hook calls git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@540 726aef4b-f618-498e-8847-2d620e286838 --- UserSock.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/UserSock.cpp b/UserSock.cpp index 1a62ab1c..d5ebd603 100644 --- a/UserSock.cpp +++ b/UserSock.cpp @@ -183,8 +183,6 @@ void CUserSock::ReadLine(const CString& sData) { sMsg = "DCC " + sLine.Token(3) + " (" + ((m_pIRCSock) ? m_pIRCSock->GetLocalIP() : GetLocalIP()) + ")"; } - CChan* pChan = m_pUser->FindChan(sTarget); - #ifdef _MODULES if (sMsg.WildCmp("\001*\001")) { CString sCTCP = sMsg; @@ -199,6 +197,8 @@ void CUserSock::ReadLine(const CString& sData) { } #endif + CChan* pChan = m_pUser->FindChan(sTarget); + if ((pChan) && (pChan->KeepBuffer())) { pChan->AddBuffer(":" + GetNickMask() + " NOTICE " + sTarget + " :" + sMsg); } @@ -358,11 +358,12 @@ void CUserSock::ReadLine(const CString& sData) { return; } - CChan* pChan = m_pUser->FindChan(sTarget); - #ifdef _MODULES MODULECALLRET(OnUserMsg(sTarget, sMsg)); #endif + + CChan* pChan = m_pUser->FindChan(sTarget); + if ((pChan) && (pChan->KeepBuffer())) { pChan->AddBuffer(":" + GetNickMask() + " PRIVMSG " + sTarget + " :" + sMsg); }