Merge CGlobalModule(s) into CModule(s)

This commit is contained in:
Kyle Fuller
2011-08-08 17:22:08 +01:00
parent a4b155995c
commit c456d20b21
23 changed files with 181 additions and 202 deletions
+6 -1
View File
@@ -443,7 +443,12 @@ def load_module(modname, args, user, retmsg, modpython):
module.SetDescription(cl.description)
module.SetArgs(args)
module.SetModPath(pymodule.__file__)
user.GetModules().push_back(module._cmod)
if user:
user.GetModules().push_back(module._cmod)
else:
CZNC.Get().GetModules().push_back(module._cmod)
try:
loaded = True
if not module.OnLoad(args, retmsg):