From ad5c83e5b3213af3e21cea73ee7d84d71873354f Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Thu, 29 Oct 2020 23:48:14 +0100 Subject: [PATCH] Display conditions - Fixed event timeline behaviour --- src/Artemis.Core/Models/Profile/RenderProfileElement.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs index 1ada1e103..dc0cb5508 100644 --- a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs +++ b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs @@ -79,7 +79,9 @@ namespace Artemis.Core public void UpdateTimeline(double deltaTime) { // The play mode dictates whether to stick to the main segment unless the display conditions contains events - bool stickToMainSegment = Timeline.PlayMode == TimelinePlayMode.Repeat && (DisplayConditionMet || DisplayCondition != null && DisplayCondition.ContainsEvents); + bool stickToMainSegment = Timeline.PlayMode == TimelinePlayMode.Repeat && DisplayConditionMet; + if (DisplayCondition != null && DisplayCondition.ContainsEvents) + stickToMainSegment = false; Timeline.Update(TimeSpan.FromSeconds(deltaTime), stickToMainSegment); }