From 93b7d245f6fc9a544f0e69c4f75015a145b043d0 Mon Sep 17 00:00:00 2001
From: Mike Morris <mikemorris@users.noreply.github.com>
Date: Mon, 25 Apr 2016 18:41:32 -0400
Subject: [PATCH] use Clock::time_point::max() instead of frame time

For Style::cascade and Style::recalculate, when rendering with
  MapMode::Still. Fixes a subtle race condition with animated
  transitions exacerbated by cd1a06c2dc209da81b3d745c088e568b3b14809f.
---
 src/mbgl/style/style.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 338f6113b..553be89dd 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -175,7 +175,7 @@ void Style::cascade(const TimePoint& timePoint, MapMode mode) {
 
     const StyleCascadeParameters parameters {
         classIDs,
-        timePoint,
+        mode == MapMode::Continuous ? timePoint : Clock::time_point::max(),
         mode == MapMode::Continuous ? transitionProperties.value_or(immediateTransition) : immediateTransition
     };
 
@@ -195,7 +195,7 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) {
 
     const StyleCalculationParameters parameters {
         z,
-        timePoint,
+        mode == MapMode::Continuous ? timePoint : Clock::time_point::max(),
         zoomHistory,
         mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero()
     };