diff options
| author | Adam <Adam@anope.org> | 2011-03-22 18:16:05 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-03-22 18:16:05 -0400 |
| commit | c02d51f52348758487223856e716261a734af8fc (patch) | |
| tree | ad126d60aabc89c388d8772fe3ecb980affc3e76 | |
| parent | b95027ba28ade04542758af429505e9633fbb9ee (diff) | |
Bug #1256
| -rw-r--r-- | modules/core/cs_xop.cpp | 2 | ||||
| -rw-r--r-- | src/chanserv.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp index 38c82d183..19dce6bd4 100644 --- a/modules/core/cs_xop.cpp +++ b/modules/core/cs_xop.cpp @@ -306,7 +306,7 @@ class XOPBase : public Command if (!SentHeader) { SentHeader = true; - source.Reply(_("%s list for %s:\n Num Nick"), ci->name.c_str()); + source.Reply(_("%s list for %s:\n Num Nick"), this->name.c_str(), ci->name.c_str()); } XOPListCallback::DoList(source, access, i + 1, level); diff --git a/src/chanserv.cpp b/src/chanserv.cpp index de43bb91c..6a5d92ad0 100644 --- a/src/chanserv.cpp +++ b/src/chanserv.cpp @@ -433,7 +433,7 @@ void cs_remove_nick(NickCore *nc) { ChanAccess *ca = ci->GetAccess(j); - if (!ca->nc->IsServicesOper() && Config->CSMaxReg && ca->nc->channelcount >= Config->CSMaxReg) + if (!ca->nc || (!ca->nc->IsServicesOper() && Config->CSMaxReg && ca->nc->channelcount >= Config->CSMaxReg)) continue; if (!highest || ca->level > highest->level) highest = ca; |