summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <mikemorris@users.noreply.github.com>2016-04-25 18:41:32 -0400
committerMike Morris <mikemorris@users.noreply.github.com>2016-04-26 11:33:05 -0400
commit93b7d245f6fc9a544f0e69c4f75015a145b043d0 (patch)
tree9e3b9f515f65104b9bc623e3aff85ca3cad7dadd
parentb39d289920ad805f4dc64b6fe452399046f2baf3 (diff)
downloadqtlocation-mapboxgl-93b7d245f6fc9a544f0e69c4f75015a145b043d0.tar.gz
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.
-rw-r--r--src/mbgl/style/style.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 338f6113b0..553be89dd4 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()
};