From 5c7b586b2d24974fd5102ca43b5aa33f781def9e Mon Sep 17 00:00:00 2001 From: psychon Date: Thu, 3 Jul 2008 10:16:49 +0000 Subject: [PATCH] Make it more clear where the 'IRCConnectEnabled'-flag is checked git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1111 726aef4b-f618-498e-8847-2d620e286838 --- User.cpp | 4 ++-- znc.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/User.cpp b/User.cpp index 1a65bf0a..a269a035 100644 --- a/User.cpp +++ b/User.cpp @@ -1086,12 +1086,12 @@ bool CUser::IsPassHashed() const { return m_bPassHashed; } bool CUser::ConnectPaused() { if (!m_uConnectTime) { m_uConnectTime = time(NULL); - return !m_bIRCConnectEnabled; + return false; } if (time(NULL) - m_uConnectTime >= 5) { m_uConnectTime = time(NULL); - return !m_bIRCConnectEnabled; + return false; } return true; diff --git a/znc.cpp b/znc.cpp index 2834a0e5..ff4d2815 100644 --- a/znc.cpp +++ b/znc.cpp @@ -125,6 +125,8 @@ bool CZNC::ConnectUser(CUser *pUser) { return false; } + if (!pUser->GetIRCConnectEnabled()) + return false; if (pIRCSock || !pUser->HasServers()) return false;