From 1818b19ebaa6584cb97455e1a91e51ecfebd4dfc Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 12 Sep 2013 22:27:30 -0400 Subject: 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 --- src/regchannel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') 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 v; spacesepstream(slevels).GetTokens(v); for (unsigned i = 0; i + 1 < v.size(); i += 2) - ci->levels[v[i]] = convertTo(v[i + 1]); + try + { + ci->levels[v[i]] = convertTo(v[i + 1]); + } + catch (const ConvertException &) { } } BotInfo *bi = BotInfo::Find(sbi); if (*ci->bi != bi) -- cgit