summaryrefslogtreecommitdiff
path: root/src/mbgl
diff options
context:
space:
mode:
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-08-07 19:54:59 +0300
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-08-08 12:14:48 +0300
commit7cdeed7cb4b88bd0d8b3e843d6806998a3f4d3f4 (patch)
tree2c9146066d4c7af5d65e96dc0db184954405654e /src/mbgl
parent8cf5103452fe5ce42f8c3ca4428243b8d5a9025a (diff)
downloadqtlocation-mapboxgl-7cdeed7cb4b88bd0d8b3e843d6806998a3f4d3f4.tar.gz
Changelog entries and a nit for #15281
Diffstat (limited to 'src/mbgl')
-rw-r--r--src/mbgl/map/transform.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 462d2462fb..d386898c3b 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -82,7 +82,7 @@ void Transform::jumpTo(const CameraOptions& camera) {
* values for any options not included in `options`.
*/
void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& animation) {
- Duration duration = animation.duration ? *animation.duration : Duration::zero();
+ Duration duration = animation.duration.value_or(Duration::zero());
if (state.bounds == LatLngBounds::unbounded() && !isGestureInProgress() && duration != Duration::zero()) {
// reuse flyTo, without exaggerated animation, to achieve constant ground speed.
return flyTo(camera, animation, true);