mirror of
https://github.com/znc/znc.git
synced 2026-08-07 01:13:25 +02:00
Fix some channel key-related mess ups.
ZNC used to keep track of two channel keys: The current one from the config and the last one it got from a +k channel mode (/mode #chan is done on join). The +k one, if it was known, always overwrote the config one and thus the one from the config doesnt need to be saved anymore. This patch now makes ZNC only use one var to hold the current channel key and this key is NOT overwritten for +k on channels. The reason for the last change: Stupid quakenet. (RFC, anyone?) In /mode replies quakenet always shows '*' as channel key, if one is set. This whole patch started with someone reporting that ZNC kept forgetting the current channel key and used '*' instead... git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1186 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -207,7 +207,6 @@ CString CChan::GetModeForNames() const {
|
||||
void CChan::SetModes(const CString& sModes) {
|
||||
m_musModes.clear();
|
||||
m_uLimit = 0;
|
||||
m_sCurKey = "";
|
||||
ModeChange(sModes);
|
||||
}
|
||||
|
||||
@@ -331,10 +330,6 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (uMode == M_Key) {
|
||||
m_sCurKey = (bAdd) ? sArg : "";
|
||||
}
|
||||
|
||||
if (!bList) {
|
||||
(bAdd) ? AddMode(uMode, sArg) : RemMode(uMode, sArg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user