[core] Factor timePoint initialization: take 2

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mbgl/map/zoom_history.hpp b/src/mbgl/map/zoom_history.hpp
index 308846b1e3..697e28573c 100644
--- a/src/mbgl/map/zoom_history.hpp
+++ b/src/mbgl/map/zoom_history.hpp
@@ -13,19 +13,20 @@ struct ZoomHistory {
     bool first = true;
 
     bool update(float z, const TimePoint& now) {
+        constexpr TimePoint zero = TimePoint(Duration::zero());
         if (first) {
             first = false;
             lastIntegerZoom = std::floor(z);
-            lastIntegerZoomTime = TimePoint(Duration::zero());
+            lastIntegerZoomTime = zero;
             lastZoom = z;
             return true;
         } else {
             if (std::floor(lastZoom) < std::floor(z)) {
                 lastIntegerZoom = std::floor(z);
-                lastIntegerZoomTime = now;
+                lastIntegerZoomTime = now == Clock::time_point::max() ? zero : now;
             } else if (std::floor(lastZoom) > std::floor(z)) {
                 lastIntegerZoom = std::floor(z + 1);
-                lastIntegerZoomTime = now;
+                lastIntegerZoomTime = now == Clock::time_point::max() ? zero : now;
             }
 
             if (z != lastZoom) {