Merge branch 'master' into bug2729

This commit is contained in:
Axel Uhl committed 2015-03-26 16:36:49 +01:00
commit ce4fabbaf2
28 files changed
+567 -310

No files matched your search

@@ -117,7 +117,7 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor {
final Distance result;
final Distance preResult = getDistanceTraveled(timePoint);
final Waypoint from = getLeg().getFrom();
if (from == getTrackedRace().getRace().getCourse().getFirstWaypoint()) {
if (preResult != null && from == getTrackedRace().getRace().getCourse().getFirstWaypoint()) {
result = preResult.add(getTrackedRace().getAdditionalGateStartDistance(getCompetitor(), timePoint));
} else {
result = preResult;