diff options
Diffstat (limited to 'src/modules/m_rmode.cpp')
| -rw-r--r-- | src/modules/m_rmode.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index 6d17820a5..dde9f496e 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -62,12 +62,7 @@ class CommandRMode : public Command ListModeBase::ModeList* ml; irc::modestacker modestack(false); - if (!mh->IsListMode()) - { - if (chan->IsModeSet(mh)) - modestack.Push(modeletter); - } - else if ((pm = mh->IsPrefixMode())) + if ((pm = mh->IsPrefixMode())) { // As user prefix modes don't have a GetList() method, let's iterate through the channel's users. for (UserMembIter it = chan->userlist.begin(); it != chan->userlist.end(); ++it) @@ -78,7 +73,7 @@ class CommandRMode : public Command modestack.Push(modeletter, it->first->nick); } } - else if (((lm = dynamic_cast<ListModeBase*>(mh)) != NULL) && ((ml = lm->GetList(chan)) != NULL)) + else if ((lm = mh->IsListModeBase()) && ((ml = lm->GetList(chan)) != NULL)) { for (ListModeBase::ModeList::iterator it = ml->begin(); it != ml->end(); ++it) { @@ -89,8 +84,8 @@ class CommandRMode : public Command } else { - user->WriteNotice("Could not remove channel mode " + ConvToStr(modeletter)); - return CMD_FAILURE; + if (chan->IsModeSet(mh)) + modestack.Push(modeletter); } parameterlist stackresult; |