iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-06 13:32:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	src/Client.cpp
	znc-buildmod.in
This commit is contained in:
J-P Nurmi
2015-07-31 23:53:30 +02:00
parent 2098dc1f2c 5c2e040cb8
commit 015a8f6502
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Chan.cpp
View File

@@ -141,7 +141,7 @@ void CChan::Cycle() const {
}
void CChan::JoinUser(const CString& sKey) {
if (!sKey.empty()) {
if (!IsOn() && !sKey.empty()) {
SetKey(sKey);
}
m_pNetwork->PutIRC("JOIN " + GetName() + " " + GetKey());