From a03cbe95c63eb12fd76cb3488948a150a76be179 Mon Sep 17 00:00:00 2001
From: prozacx <prozacx@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 24 Sep 2005 04:26:41 +0000
Subject: [PATCH] Added MODULECALLCONT() and tweaked other module macros

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@525 726aef4b-f618-498e-8847-2d620e286838
---
 main.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/main.h b/main.h
index a5262a65..55074a69 100644
--- a/main.h
+++ b/main.h
@@ -26,12 +26,28 @@
 		CGlobalModules& GMods = CZNC::Get().GetModules();			\
 		GMods.SetUser(m_pUser);										\
 		if (GMods.func || m_pUser->GetModules().func) {				\
+			GMods.SetUser(NULL);									\
 			return;													\
 		}															\
 		GMods.SetUser(NULL);										\
 	}
 #else
-#define MODULECALL(func)
+#define MODULECALLRET(func)
+#endif
+
+#ifdef _MODULES
+#define MODULECALLCONT(func)										\
+	if (m_pUser) {													\
+		CGlobalModules& GMods = CZNC::Get().GetModules();			\
+		GMods.SetUser(m_pUser);										\
+		if (GMods.func || m_pUser->GetModules().func) {				\
+			GMods.SetUser(NULL);									\
+			continue;												\
+		}															\
+		GMods.SetUser(NULL);										\
+	}
+#else
+#define MODULECALLCONT(func)
 #endif
 
 #ifdef _MODULES
@@ -40,6 +56,7 @@
 		CGlobalModules& GMods = CZNC::Get().GetModules();			\
 		GMods.SetUser(m_pUser);										\
 		if (GMods.func || m_pUser->GetModules().func) {				\
+			GMods.SetUser(NULL);									\
 			return true;											\
 		}															\
 		GMods.SetUser(NULL);										\