Merge pull request #50 from bpcampbe/TrimBuffer

Add CChan::TrimBuffer and have SetBufferCount call it.
znc · Jun 7, 2011 · f6113b3 · f6113b3
2 parents ea19e3f + c3a15bf
commit f6113b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Chan.cpp b/Chan.cpp
@@ -112,6 +112,7 @@ bool CChan::SetBufferCount(unsigned int u, bool bForce) {
 	if (!bForce && u > CZNC::Get().GetMaxBufferSize())
 		return false;
 	m_uBufferCount = u;
+	TrimBuffer(m_uBufferCount);
 	return true;
 }
 
@@ -534,6 +535,12 @@ void CChan::ClearBuffer() {
 	m_vsBuffer.clear();
 }
 
+void CChan::TrimBuffer(const unsigned int uMax) {
+	if (m_vsBuffer.size() > uMax) {
+		m_vsBuffer.erase(m_vsBuffer.begin(), m_vsBuffer.begin() + (uMax - m_vsBuffer.size())); 
+	}
+}
+
 void CChan::SendBuffer(CClient* pClient) {
 	if (m_pUser && m_pUser->IsUserAttached()) {
 		const vector<CString>& vsBuffer = GetBuffer();

diff --git a/Chan.h b/Chan.h
@@ -88,6 +88,7 @@ class CChan {
 	// Buffer
 	int AddBuffer(const CString& sLine);
 	void ClearBuffer();
+	void TrimBuffer(const unsigned int uMax);
 	void SendBuffer(CClient* pClient);
 	// !Buffer