Fix a few oversights

This partially reverts e0cb6bd46fb1d804ad6adea5688c844f7e1a0f6f

diff --git a/src/channels.cpp b/src/channels.cpp
index 09b4e8dc98929c0c2f07e17b9d5856af3c3ecf57..8a4ed3f49badde77a33c58d54ae8b87bcf383114 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -333,16 +333,16 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 
 void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
 {
-       Membership* memb = this->AddUser(user);
-       if (!memb)
-               return; // Already on the channel
-
        if (IS_SERVER(user))
        {
                ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
                return;
        }
 
+       Membership* memb = this->AddUser(user);
+       if (!memb)
+               return; // Already on the channel
+
        user->chans.insert(this);
 
        if (privs)

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 29156973c0cd47767beb1b79e6b68809571c720a..799e860fbe9c8254a1d5f6d38aa8be01fb434c65 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -137,6 +137,7 @@ void InspIRCd::Cleanup()
        DeleteZero(this->Threads);
        DeleteZero(this->Timers);
        DeleteZero(this->SE);
+       Logs->CloseLogs();
        DeleteZero(this->Logs);
 }
 

diff --git a/src/logger.cpp b/src/logger.cpp
index 564f0fdac00740c24ff16fe4d80a3e0d86c4922a..47c726c51b648ec35ed177f2d27654235fb04675 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -61,7 +61,6 @@ LogManager::LogManager()
 
 LogManager::~LogManager()
 {
-       CloseLogs();
 }
 
 void LogManager::OpenFileLogs()

diff --git a/src/mode.cpp b/src/mode.cpp
index 1e1c7a25c5ad339bd929f8ea35cc9d10bee8334d..a096c9c6ae9461a463e4a8521da887cd2642451f 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -818,7 +818,7 @@ void ModeHandler::RemoveMode(User* user)
                parameters.push_back(user->nick);
                parameters.push_back("-");
                parameters[1].push_back(this->GetModeChar());
-               ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient);
+               ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
        }
 }
 

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index cc8871abd88dd54b79e9ecd4073c95125c86bf74..25787e3a327c7feceacd5a477cb8408e359c4ed6 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -844,7 +844,8 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
 
 CullResult ModuleSpanningTree::cull()
 {
-       Utils->cull();
+       if (Utils)
+               Utils->cull();
        return this->Module::cull();
 }