summaryrefslogtreecommitdiff
path: root/src/regchannel.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-09-12 22:27:30 -0400
committerAdam <Adam@anope.org>2013-09-27 16:33:56 -0400
commit1818b19ebaa6584cb97455e1a91e51ecfebd4dfc (patch)
tree61e977a285544b7d1ee269f86512b533d51869af /src/regchannel.cpp
parentabc7e4b423d6701e5771ff08b3eadf81f50488ec (diff)
Fix cs_mode lock reply if nothing is done
Fix not clearing forbids when os_forbid is unloaded Apply nick and chan forbids when added Fix loading forbids until after the service is constructed
Diffstat (limited to 'src/regchannel.cpp')
-rw-r--r--src/regchannel.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index c2119453b..f5b85c033 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -266,7 +266,11 @@ Serializable* ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data)
std::vector<Anope::string> v;
spacesepstream(slevels).GetTokens(v);
for (unsigned i = 0; i + 1 < v.size(); i += 2)
- ci->levels[v[i]] = convertTo<int16_t>(v[i + 1]);
+ try
+ {
+ ci->levels[v[i]] = convertTo<int16_t>(v[i + 1]);
+ }
+ catch (const ConvertException &) { }
}
BotInfo *bi = BotInfo::Find(sbi);
if (*ci->bi != bi)