Fixed amb667 - Forward called twice when returning Plugin_Stop in ET_Hook
--HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401146
This commit is contained in:
parent
5de1cc57ce
commit
d7512156e8
@ -351,8 +351,7 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
|
|||||||
high_result = cur_result;
|
high_result = cur_result;
|
||||||
if ((ResultType)high_result == Pl_Stop)
|
if ((ResultType)high_result == Pl_Stop)
|
||||||
{
|
{
|
||||||
iter = m_functions.end();
|
goto done;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -363,7 +362,7 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
|
|||||||
{
|
{
|
||||||
if (filter->OnFunctionReturn(this, func, &cur_result) == Pl_Stop)
|
if (filter->OnFunctionReturn(this, func, &cur_result) == Pl_Stop)
|
||||||
{
|
{
|
||||||
iter = m_functions.end();
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -376,6 +375,7 @@ int CForward::Execute(cell_t *result, IForwardFilter *filter)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
done:
|
||||||
if (success)
|
if (success)
|
||||||
{
|
{
|
||||||
if (m_ExecType == ET_Event || m_ExecType == ET_Hook)
|
if (m_ExecType == ET_Event || m_ExecType == ET_Hook)
|
||||||
|
Loading…
Reference in New Issue
Block a user