X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=20d4c8e8faeeed905350aac88dfc2eb79c90b511;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=dfc2e23612f60c4af5c70c9643b6adbcdd2647e9;hpb=349106f3f9f75d7f957fc5d1e71ca650f4807bb9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index dfc2e2361..20d4c8e8f 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -50,6 +50,7 @@ class ModuleDelayJoin : public Module
 	void init()
 	{
 		ServerInstance->Modules->AddService(djm);
+		ServerInstance->Modules->AddService(unjoined);
 		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
@@ -181,6 +182,11 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mo
 	if (!user || !channel || param.empty())
 		return MOD_RES_PASSTHRU;
 
+	ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_CHANNEL);
+	// If not a prefix mode then we got nothing to do here
+	if (!mh || !mh->GetPrefixRank())
+		return MOD_RES_PASSTHRU;
+
 	User* dest;
 	if (IS_LOCAL(user))
 		dest = ServerInstance->FindNickOnly(param);