Fix a few problems

- Fix configuration issue on systems without both GnuTLS and OpenSSL. (@SaberUK)
- Do not set Membership::modes in ForceJoin() incorrectly to privs
- Fix crash when spanningtree detects a configuration error on load

2 files changed, 2 insertions, 1 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index cab4fb739..afc569909 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -337,7 +337,6 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
 	{
 		// If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a
 		// remote user and his own server set the modes), then set them internally now
-		memb->modes = *privs;
 		for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
 		{
 			ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index d9a3afbd4..9c2f3969a 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -688,6 +688,8 @@ void ModuleSpanningTree::OnLoadModule(Module* mod)
 
 void ModuleSpanningTree::OnUnloadModule(Module* mod)
 {
+	if (!Utils)
+		return;
 	ServerInstance->PI->SendMetaData(NULL, "modules", "-" + mod->ModuleSourceFile);
 
 	unsigned int items = Utils->TreeRoot->ChildCount();