Implement suggestion from Stealth in bug #572: expand <channeltopic> tag into a subse...

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index c82c351abb9849cbd3f1ccac763e0947ac5597cf..a86c6f824aafdee5af99035e45f6c472bd02b1dd 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -886,7 +886,7 @@ void User::CheckClass()
        this->MaxChans = a->GetMaxChans();
 }
 
-void User::CheckLines()
+bool User::CheckLines()
 {
        const char* check[] = { "G" , "K", NULL };
 
@@ -899,10 +899,12 @@ void User::CheckLines()
                        if (r)
                        {
                                r->Apply(this);
-                               return;
+                               return true;
                        }
                }
        }
+
+       return false;
 }
 
 void User::FullConnect()
@@ -927,7 +929,8 @@ void User::FullConnect()
                return;
        }
 
-       CheckLines();
+       if (this->CheckLines())
+               return;
 
        this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
        this->WriteNumeric(001, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host.c_str());