diff options
Diffstat (limited to 'modules/nickserv')
| -rw-r--r-- | modules/nickserv/ajoin.cpp | 7 | ||||
| -rw-r--r-- | modules/nickserv/set.cpp | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/modules/nickserv/ajoin.cpp b/modules/nickserv/ajoin.cpp index d7689205d..79ca271c3 100644 --- a/modules/nickserv/ajoin.cpp +++ b/modules/nickserv/ajoin.cpp @@ -321,12 +321,7 @@ class NSAJoin : public Module for (AutoJoin *entry : channels) { Channel *c = Channel::Find(entry->GetChannel()); - ChanServ::Channel *ci; - - if (c) - ci = c->ci; - else - ci = ChanServ::Find(entry->GetChannel()); + ChanServ::Channel *ci = ChanServ::Find(entry->GetChannel()); bool need_invite = false; Anope::string key = entry->GetKey(); diff --git a/modules/nickserv/set.cpp b/modules/nickserv/set.cpp index 33882f110..31c41c7ad 100644 --- a/modules/nickserv/set.cpp +++ b/modules/nickserv/set.cpp @@ -1118,7 +1118,7 @@ class NSSet : public Module void OnSetCorrectModes(User *user, Channel *chan, ChanServ::AccessGroup &access, bool &give_modes, bool &take_modes) override { - if (chan->ci) + if (chan->GetChannel()) { /* Only give modes if autoop is set */ give_modes &= !user->Account() || user->Account()->IsAutoOp(); |