X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=4308068e3e83aaa57b2a36744282d183fbfc9bc4;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=87e3aa38074aa0897407aaaf805491b6cb7a4047;hpb=3ed3241a5c38dde202deaa73204fecbe9d12d303;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 87e3aa380..4308068e3 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -22,6 +22,7 @@ class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
+		std::vector<std::string> operChans;
 		ConfigReader* conf;
 		
 
@@ -51,6 +52,9 @@ class ModuleOperjoin : public Module
 			
 			conf = new ConfigReader(ServerInstance);
 			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
 		}
 
 		void Implements(char* List)
@@ -62,6 +66,10 @@ class ModuleOperjoin : public Module
 		{
 			DELETE(conf);
 			conf = new ConfigReader(ServerInstance);
+			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
 		}
 
 		virtual ~ModuleOperjoin()
@@ -79,15 +87,9 @@ class ModuleOperjoin : public Module
 			if (!IS_LOCAL(user))
 				return;
 
-			if (!operChan.empty())
-			{
-				std::vector<std::string> operChans;
-				tokenize(operChan,operChans);
-				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-					if (ServerInstance->IsChannel(it->c_str()))
-						chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-			}
-
+			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+				if (ServerInstance->IsChannel(it->c_str()))
+					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "");
 		}
 
 };