Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov
2019-03-30 16:17:59 +00:00
6 changed files with 44 additions and 9 deletions

View File

@@ -1482,9 +1482,9 @@ void CIRCNetwork::SetBindHost(const CString& s) {
}
void CIRCNetwork::SetEncoding(const CString& s) {
m_sEncoding = s;
m_sEncoding = CZNC::Get().FixupEncoding(s);
if (GetIRCSock()) {
GetIRCSock()->SetEncoding(s);
GetIRCSock()->SetEncoding(m_sEncoding);
}
}