Skip to content
Browse files

fixed a null reference to pClient in hooks 'OnChanBufferStarting,OnCh…

…anBufferStarting,OnChanBufferEnding,OnChanBufferEnding', such that when pClient is NULL the hooks are called on all clients associated to that user

Conflicts:

	Chan.cpp

Signed-off-by: Uli Schlachter <psychon@znc.in>
  • Loading branch information...
1 parent 7354564 commit 244052f0de87f5c7f8e4920244cdb72de98fee98 Jim Hull committed with psychon Sep 12, 2011
Showing with 28 additions and 17 deletions.
  1. +28 −17 Chan.cpp
View
45 Chan.cpp
@@ -547,28 +547,39 @@ void CChan::SendBuffer(CClient* pClient) {
const vector<CString>& vsBuffer = GetBuffer();
if (vsBuffer.size()) {
- bool bSkipStatusMsg = false;
- MODULECALL(OnChanBufferStarting(*this, *pClient), m_pUser, NULL, bSkipStatusMsg = true);
+ const vector<CClient*> & vClients = m_pUser->GetClients();
+ for( size_t uClient = 0; uClient < vClients.size(); ++uClient ) {
+ // in the event that pClient is NULL, need to send this to all clients for the user
+ // I'm presuming here that pClient is listed inside vClients so thus vClients at this
+ // point can't be empty. Rework this if you like ...
+
+ CClient * pUseClient = ( pClient ? pClient : vClients[uClient] );
+ bool bSkipStatusMsg = false;
+ MODULECALL(OnChanBufferStarting(*this, *pUseClient), m_pUser, NULL, bSkipStatusMsg = true);
+
+ if (!bSkipStatusMsg) {
+ m_pUser->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Buffer Playback...", pUseClient);
+ }
- if (!bSkipStatusMsg) {
- m_pUser->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Buffer Playback...", pClient);
- }
+ for (unsigned int a = 0; a < vsBuffer.size(); a++) {
+ CString sLine(vsBuffer[a]);
+ MODULECALL(OnChanBufferPlayLine(*this, *pUseClient, sLine), m_pUser, NULL, continue);
+ m_pUser->PutUser(sLine, pUseClient);
+ }
- for (unsigned int a = 0; a < vsBuffer.size(); a++) {
- CString sLine(vsBuffer[a]);
- MODULECALL(OnChanBufferPlayLine(*this, *pClient, sLine), m_pUser, NULL, continue);
- m_pUser->PutUser(sLine, pClient);
- }
+ if (!KeepBuffer()) {
+ ClearBuffer();
+ }
- if (!KeepBuffer()) {
- ClearBuffer();
- }
+ bSkipStatusMsg = false;
+ MODULECALL(OnChanBufferEnding(*this, *pUseClient), m_pUser, NULL, bSkipStatusMsg = true);
- bSkipStatusMsg = false;
- MODULECALL(OnChanBufferEnding(*this, *pClient), m_pUser, NULL, bSkipStatusMsg = true);
+ if (!bSkipStatusMsg) {
+ m_pUser->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Playback Complete.", pUseClient);
+ }
- if (!bSkipStatusMsg) {
- m_pUser->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Playback Complete.", pClient);
+ if( pClient )
+ break;
}
}
}

0 comments on commit 244052f

Please sign in to comment.
Something went wrong with that request. Please try again.