Fix for bug #237

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6631 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 4 insertions, 2 deletions

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 1736ffa37..6d5c607be 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -83,7 +83,8 @@ class ModuleConnJoin : public Module
 				std::vector<std::string> Joinchans;
 				tokenize(JoinChan,Joinchans);
 				for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
+					if (ServerInstance->IsChannel(it->c_str()))
+						chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
 			}
 
 		}
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 7150c5b83..87e3aa380 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -84,7 +84,8 @@ class ModuleOperjoin : public Module
 				std::vector<std::string> operChans;
 				tokenize(operChan,operChans);
 				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
+					if (ServerInstance->IsChannel(it->c_str()))
+						chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
 			}
 
 		}