X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=bb96b461745f32e37368caba054096802cdd7523;hb=87dbe508d5d897d73321c0e26efcddd36505e3ad;hp=126221dd22f1f84d020b23a1f0e7ee917895eee9;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 126221dd2..bb96b4617 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -160,6 +160,10 @@ class ModuleDelayJoin : public Module
 
 	void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list)
 	{
+		/* Server origin */
+		if (!user)
+			return;
+
 		if (target_type != TYPE_CHANNEL)
 			return;
 
@@ -188,7 +192,7 @@ class ModuleDelayJoin : public Module
 		user->Shrink("delayjoin");
 	}
 
-	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5)
 	{
 		va_list argsPtr;
 		char textbuffer[MAXBUF];