diff --git a/Modules.cpp b/Modules.cpp index 212b8774..9dc3731e 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -105,7 +105,6 @@ const CString& CTimer::GetDescription() const { return m_sDescription; } CModule::CModule(ModHandle pDLL, CUser* pUser, const CString& sModName, const CString& sDataDir) { m_bFake = false; - m_bGlobal = false; m_pDLL = pDLL; m_pManager = &(CZNC::Get().GetManager());; m_pUser = pUser; @@ -699,7 +698,6 @@ bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* p } pModule->SetDescription(sDesc); - pModule->SetGlobal(bIsGlobal); pModule->SetArgs(sArgs); push_back(pModule); diff --git a/Modules.h b/Modules.h index fa61b166..2e29124f 100644 --- a/Modules.h +++ b/Modules.h @@ -678,14 +678,12 @@ public: // Setters void SetFake(bool b) { m_bFake = b; } - void SetGlobal(bool b) { m_bGlobal = b; } void SetDescription(const CString& s) { m_sDescription = s; } void SetArgs(const CString& s) { m_sArgs = s; } // !Setters // Getters bool IsFake() const { return m_bFake; } - bool IsGlobal() const { return m_bGlobal; } const CString& GetDescription() const { return m_sDescription; } const CString& GetArgs() const { return m_sArgs; } @@ -704,7 +702,6 @@ public: protected: bool m_bFake; - bool m_bGlobal; CString m_sDescription; set m_sTimers; set m_sSockets; diff --git a/Socket.cpp b/Socket.cpp index 1d6661a5..973c6ed1 100644 --- a/Socket.cpp +++ b/Socket.cpp @@ -50,7 +50,7 @@ CSocket::~CSocket() { m_pModule->UnlinkSocket(this); - if (!m_pModule->IsGlobal() && pUser) { + if (pUser) { pUser->AddBytesWritten(GetBytesWritten()); pUser->AddBytesRead(GetBytesRead()); } else {