Argh, i give up

[user/henk/code/inspircd.git] / src / modules / m_banredirect.cpp

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 4a46a7264535a485b5095db9a45866f4bffb9d1d..80a79e25b256da57a8774877ff375f63cc2c60d4 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -194,7 +194,10 @@ class ModuleBanRedirect : public Module
                nofollow = false;
                
                if(!ServerInstance->AddModeWatcher(re))
+               {
+                       delete re;
                        throw ModuleException("Could not add mode watcher");
+               }
 
                OnRehash(NULL, "");
 
@@ -255,7 +258,7 @@ class ModuleBanRedirect : public Module
                ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
        }
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, bool synching = false)
        {
                /* This prevents recursion when a user sets multiple ban redirects in a chain
                 * (thanks Potter)
@@ -304,7 +307,7 @@ class ModuleBanRedirect : public Module
                                                        user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
                                                        user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
                                                        nofollow = true;
-                                                       Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
+                                                       Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time(true));
                                                        nofollow = false;
                                                        return 1;
                                                }