Merge branch 'design2015-races' of ssh://sapsailing.com/home/trac/git into design2015-races

# By Steffen Schaefer
# Via Steffen Schaefer
* 'design2015-races' of ssh://sapsailing.com/home/trac/git:
  Fixed calculation of live race count for regatta progress
This commit is contained in:
Papick Garcia Taboada committed 2015-07-14 16:10:55 +02:00
commit 6284ad7ef0
1 file changed
+6
@@ -564,6 +564,12 @@ public class RaceContext {
}
public boolean isLive() {
if(getStartTime() == null) {
return false;
}
if (trackedRace != null && trackedRace.hasGPSData() && trackedRace.hasWindData()) {
return trackedRace.isLive(now);
}
return getLiveRaceViewState() == RaceViewState.RUNNING;
}
}