cmd_who: don't show +p channels or channels hidden with m_hidechans

[user/henk/code/inspircd.git] / src / modes / cmode_b.cpp

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 6bdd076f81e404191ef548f02ab588e7220e7615..e45f191f78d330a1ce280b9ec93f6827dc6611c3 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -116,7 +116,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
                return dest;
 
        long maxbans = chan->GetMaxBans();
-       if (IS_LOCAL(user) && ((unsigned)chan->bans.size() > (unsigned)maxbans))
+       if (IS_LOCAL(user) && ((unsigned)chan->bans.size() >= (unsigned)maxbans))
        {
                user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str(), maxbans);
                dest.clear();
@@ -168,6 +168,7 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
                                dest.clear();
                                return dest;
                        }
+                       dest = i->data;
                        chan->bans.erase(i);
                        return dest;
                }