Add "created" parameter to OnUserJoin, to avoid explicit checks for +P

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 30db77e4d7a2b3ccf1f40bdd4e7e0fb542d6244c..7babc7bb776dfcc6b2a577b27fe5ae4c67b6c581 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -706,8 +706,8 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
                        ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
                        if (oldMask != oldBlocksByMask.end())
                        {
-                               oldBlocksByMask.erase(oldMask);
                                ConnectClass* old = oldMask->second;
+                               oldBlocksByMask.erase(oldMask);
                                old->Update(me);
                                delete me;
                                me = old;
@@ -1019,8 +1019,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                                }
                                break;
                        }
-                       /* We're done with this now */
-                       delete Values[Index].val;
                }
 
                /* Read the multiple-tag items (class tags, connect tags, etc)