pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 23:03:12 +02:00
Code Activity

Made mode lock del check status of the mode lock before removing it

Browse Source
This commit is contained in:
Adam
2012-02-18 15:47:16 -05:00
parent ee5cd8493e
commit f2ce9cd85c
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/regchannel.cpp
+12 -3
View File
@@ -806,10 +806,11 @@ bool ChannelInfo::SetMLock(ChannelMode *mode, bool status, const Anope::string &
/** Remove a mlock
* @param mode The mode
* @param status True for mlock on, false for mlock off
* @param param The param of the mode, required if it is a list or status mode
* @return true on success, false on failure
*/
bool ChannelInfo::RemoveMLock(ChannelMode *mode, const Anope::string &param)
bool ChannelInfo::RemoveMLock(ChannelMode *mode, bool status, const Anope::string &param)
{
if (mode->Type == MODE_REGULAR || mode->Type == MODE_PARAM)
{
@@ -817,13 +818,21 @@ bool ChannelInfo::RemoveMLock(ChannelMode *mode, const Anope::string &param)
if (it != this->mode_locks.end())
for (; it != it_end; it = it_next)
{
const ModeLock &ml = it->second;
++it_next;
if (status != ml.set)
continue;
EventReturn MOD_RESULT;
FOREACH_RESULT(I_OnUnMLock, OnUnMLock(this, &it->second));
if (MOD_RESULT != EVENT_STOP)
{
this->mode_locks.erase(it);
return true;
}
}
return true;
return false;
}
else
{
@@ -835,7 +844,7 @@ bool ChannelInfo::RemoveMLock(ChannelMode *mode, const Anope::string &param)
for (; it != it_end; ++it)
{
const ModeLock &ml = it->second;
if (ml.param == param)
if (ml.set == status && ml.param == param)
{
EventReturn MOD_RESULT;
FOREACH_RESULT(I_OnUnMLock, OnUnMLock(this, &it->second));