Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2016-01-09 18:23:06 +00:00
4 changed files with 14 additions and 4 deletions

View File

@@ -1454,7 +1454,12 @@ void CIRCNetwork::SetBindHost(const CString& s) {
}
}
void CIRCNetwork::SetEncoding(const CString& s) { m_sEncoding = s; }
void CIRCNetwork::SetEncoding(const CString& s) {
m_sEncoding = s;
if (GetIRCSock()) {
GetIRCSock()->SetEncoding(s);
}
}
void CIRCNetwork::SetQuitMsg(const CString& s) {
if (m_pUser->GetQuitMsg().Equals(s)) {