Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2015-08-11 21:32:33 +01:00
2 changed files with 2 additions and 7 deletions
+1 -1
View File
@@ -853,7 +853,7 @@ CString CClient::GetNickMask() const {
sHost = "irc.znc.in";
}
return GetNick() + "!" + (m_pNetwork ? m_pNetwork->GetBindHost() : m_pUser->GetIdent()) + "@" + sHost;
return GetNick() + "!" + (m_pNetwork ? m_pNetwork->GetIdent() : m_pUser->GetIdent()) + "@" + sHost;
}
bool CClient::IsValidIdentifier(const CString& sIdentifier) {