Fixed onloadmodule

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

2 files changed, 7 insertions, 2 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 9523e13ca..d580b79e1 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2542,7 +2542,6 @@ bool LoadModule(const char* filename)
                 {
 			Module* m = factory[MODCOUNT+1]->factory->CreateModule();
                         modules[MODCOUNT+1] = m;
-			FOREACH_MOD OnLoadModule(m,filename_str);
                         /* save the module and the module's classfactory, if
                          * this isnt done, random crashes can occur :/ */
                         module_names.push_back(filename);
@@ -2563,6 +2562,7 @@ bool LoadModule(const char* filename)
         }
 #endif
 	MODCOUNT++;
+	FOREACH_MOD OnLoadModule(modules[MODCOUNT],filename_str);
 	return true;
 }
 
@@ -3261,7 +3261,11 @@ int InspIRCd(char** argv, int argc)
 					{
 						result = cu->ReadData(data, 65535);
 					}
-					else result = result2;
+					else
+					{
+						log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+						result = result2;
+					}
 					log(DEBUG,"Read result: %d",result);
 					if (result)
 					{
diff --git a/src/users.cpp b/src/users.cpp
index d4e87780c..d9a20411b 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -76,6 +76,7 @@ int userrec::ReadData(void* buffer, size_t size)
 {
 	if (this->fd > -1)
 	{
+		log(DEBUG,"userrec::ReadData on fd %d",this->fd);
 		return read(this->fd, buffer, size);
 	}
 	else return 0;