Fix a few oversights

This partially reverts e0cb6bd46fb1d804ad6adea5688c844f7e1a0f6f

5 files changed, 8 insertions, 7 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 09b4e8dc9..8a4ed3f49 100644
--- 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 29156973c..799e860fb 100644
--- 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 564f0fdac..47c726c51 100644
--- 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 1e1c7a25c..a096c9c6a 100644
--- 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 cc8871abd..25787e3a3 100644
--- 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();
 }