diff options
| author |  attilamolnar | 2013-04-28 00:32:14 +0200 |
|---|---|---|
| committer | attilamolnar | 2013-04-28 00:32:14 +0200 |
| commit | 8790551dc182cd8804ee7d8ef89ccb31067cc2a4 (patch) | |
| tree | fa411b244ae8541e49eb126a9d15a7b5a13504db /src/channels.cpp | |
| parent | Added RMODE command per suggestion #479 (diff) | |
| parent | Release 2.0.12 (diff) | |
Merge insp20
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index edb4d056a..9e9ad670a 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -34,12 +34,10 @@ static ModeReference ban(NULL, "ban"); Channel::Channel(const std::string &cname, time_t ts) { - chan_hash::iterator findchan = ServerInstance->chanlist->find(cname); - if (findchan != ServerInstance->chanlist->end()) + if (!ServerInstance->chanlist->insert(std::make_pair(cname, this)).second) throw CoreException("Cannot create duplicate channel " + cname); - (*(ServerInstance->chanlist))[cname.c_str()] = this; - this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax); + this->name = cname; this->age = ts ? ts : ServerInstance->Time(); topicset = 0; |