adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1154 from jreese/server-details

Browse Source 
#1147: show new server name when jumping
This commit is contained in:
Alexey Sokolov
2015-10-25 20:08:32 +00:00
parent 69b031c43c 9aff0cd566
commit cf1c56557a
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/IRCNetwork.h
+1 -1
View File
@@ -120,7 +120,7 @@ public:
bool DelServer(const CString& sName, unsigned short uPort, const CString& sPass);
bool AddServer(const CString& sName);
bool AddServer(const CString& sName, unsigned short uPort, const CString& sPass = "", bool bSSL = false);
CServer* GetNextServer();
CServer* GetNextServer(bool bAdvance = true);
CServer* GetCurrentServer() const;
void SetIRCServer(const CString& s);
bool SetNextServer(const CServer* pServer);
src/ClientCommand.cpp
+4
View File
@@ -334,6 +334,10 @@ void CClient::UserCommand(CString& sLine) {
}
}
if (!pServer) {
pServer = m_pNetwork->GetNextServer(false);
}
if (GetIRCSock()) {
GetIRCSock()->Quit();
if (pServer)
src/IRCNetwork.cpp
+6 -2
View File
@@ -1142,7 +1142,7 @@ bool CIRCNetwork::AddServer(const CString& sName, unsigned short uPort, const CS
return true;
}
CServer* CIRCNetwork::GetNextServer() {
CServer* CIRCNetwork::GetNextServer(bool bAdvance) {
if (m_vServers.empty()) {
return nullptr;
}
@@ -1151,7 +1151,11 @@ CServer* CIRCNetwork::GetNextServer() {
m_uServerIdx = 0;
}
return m_vServers[m_uServerIdx++];
if (bAdvance) {
return m_vServers[m_uServerIdx++];
} else {
return m_vServers[m_uServerIdx];
}
}
CServer* CIRCNetwork::GetCurrentServer() const {