Merge branch 'master' into issue_18_trackpoint

2017-08-16 16:52:32 +12:00
parent 5a03d97713 8498701091
commit f1e41d5d8f
29 changed files with 1228 additions and 200 deletions
@@ -172,7 +172,7 @@ public class VisualiserBoat extends Boat {
     */
    public String getTimeToNextMarkFormatted(ZonedDateTime currentTime) {

-        if (getTimeAtLastMark() != null) {
+        if ((getTimeAtLastMark() != null) && (currentTime != null)) {
            //Calculate time delta.
            Duration timeUntil = Duration.between(currentTime, getEstimatedTimeAtNextMark());

@@ -211,7 +211,7 @@ public class VisualiserBoat extends Boat {
     */
    public String getTimeSinceLastMarkFormatted(ZonedDateTime currentTime) {

-        if (getTimeAtLastMark() != null) {
+        if ((getTimeAtLastMark() != null) && (currentTime != null)) {
            //Calculate time delta.
            Duration timeSince = Duration.between(getTimeAtLastMark(), currentTime);