Fix core timing when an event eats cycles.
Merge pull request #6464 from unknownbrackets/timing

Fix core timing when an event eats cycles