iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	README.md
	modules/data/webadmin/tmpl/settings.tmpl
	src/Query.cpp
This commit is contained in:
J-P Nurmi
2015-07-14 23:03:21 +02:00
parent d39b20b505 34d9183ff1
commit 9242307ff7
3 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Query.cpp
View File

@@ -21,7 +21,8 @@
using std::vector;
CQuery::CQuery(const CString& sName, CIRCNetwork* pNetwork) : m_sName(sName), m_pNetwork(pNetwork), m_Buffer() {
SetBufferCount(m_pNetwork->GetUser()->GetBufferCount(), true);
// Bandaid for users who upgrade from <=1.4 and have 0 in "default channel buffer size" setting.
SetBufferCount(std::max(100u, m_pNetwork->GetUser()->GetBufferCount()), true);
}
CQuery::~CQuery() {