Merge branch 'master' into bug1407-new

This commit is contained in:
Axel Uhl committed 2013-06-05 09:44:49 +02:00
commit 37a057d660
2 files changed
+6 -2

No files matched your search

@@ -670,7 +670,9 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
@Override @Override
public void detachRaceLog() { public void detachRaceLog() {
logListener.removeFrom(attachedRaceLog); if (attachedRaceLog != null) {
logListener.removeFrom(attachedRaceLog);
}
super.detachRaceLog(); super.detachRaceLog();
} }
@@ -49,7 +49,9 @@ public class DynamicTrackedRaceLogListener implements RaceLogEventVisitor {
// Maybe something like this is needed: // Maybe something like this is needed:
// TODO: // TODO:
// ??? trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.PREPARED, 0.0)); // ??? trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.PREPARED, 0.0));
raceLog.removeListener(this); if (raceLog != null) {
raceLog.removeListener(this);
}
} }
private void analyze() { private void analyze() {