Skip to content

Commit e3d9913

Browse files
committed
Bugfix in stuff about negative plugin sequences
1 parent 4a71204 commit e3d9913

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

ProcessPreviousLine.cpp

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -618,18 +618,21 @@ assemble the full text of the original line.
618618
m_CurrentPlugin = NULL; // not in a plugin any more
619619

620620
// do main triggers
621-
if (m_iStopTriggerEvaluation == eKeepEvaluatingTriggers)
622-
ProcessOneTriggerSequence (strCurrentLine,
623-
StyledLine,
624-
strResponse,
625-
prevpos,
626-
bNoLog,
627-
bNoOutput,
628-
bChangedColour,
629-
triggerList,
630-
strExtraOutput,
631-
mapDeferredScripts,
632-
mapOneShotItems);
621+
if (m_iStopTriggerEvaluation != eStopEvaluatingTriggersInAllPlugins)
622+
{
623+
m_iStopTriggerEvaluation = eKeepEvaluatingTriggers;
624+
ProcessOneTriggerSequence (strCurrentLine,
625+
StyledLine,
626+
strResponse,
627+
prevpos,
628+
bNoLog,
629+
bNoOutput,
630+
bChangedColour,
631+
triggerList,
632+
strExtraOutput,
633+
mapDeferredScripts,
634+
mapOneShotItems);
635+
} // end of trigger evaluation not stopped
633636

634637
// do plugins (stop if one stops trigger evaluation, or if it was stopped by the main world triggers)
635638
for ( // pit should now be pointing at plugins with a sequence number >= 0

0 commit comments

Comments
 (0)