diff --git a/src/Artemis.Core/Models/Profile/Timeline.cs b/src/Artemis.Core/Models/Profile/Timeline.cs index c4e49cc56..55ff7d3cd 100644 --- a/src/Artemis.Core/Models/Profile/Timeline.cs +++ b/src/Artemis.Core/Models/Profile/Timeline.cs @@ -387,7 +387,12 @@ namespace Artemis.Core IsOverridden = true; if (stickToMainSegment && Position >= MainSegmentStartPosition) - Position = MainSegmentStartPosition + TimeSpan.FromMilliseconds(Position.TotalMilliseconds % MainSegmentLength.TotalMilliseconds); + { + if (MainSegmentLength > TimeSpan.Zero) + Position = MainSegmentStartPosition + TimeSpan.FromMilliseconds(Position.TotalMilliseconds % MainSegmentLength.TotalMilliseconds); + else + Position = MainSegmentStartPosition; + } _extraTimelines.Clear(); }