From 8f438ecdb74de29028080e6472b8381fa0764837 Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <info@ivovandongen.nl>
Date: Sat, 30 Jul 2016 18:50:49 -0400
Subject: [core] #5836 - kill transition finish function pointer before calling
 to avoid loop

---
 src/mbgl/map/transform.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 41fc36ce27..55fdb37732 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -559,7 +559,9 @@ void Transform::startTransition(const CameraOptions& camera,
                                 std::function<Update(double)> frame,
                                 const Duration& duration) {
     if (transitionFinishFn) {
-        transitionFinishFn();
+        std::function<void()> tmpFunction = transitionFinishFn;
+        transitionFinishFn = nullptr;
+        tmpFunction();
     }
 
     bool isAnimated = duration != Duration::zero();
@@ -599,8 +601,9 @@ void Transform::startTransition(const CameraOptions& camera,
                 callback(MapChangeRegionIsChanging);
             }
         } else {
-            transitionFinishFn();
+            std::function<void()> tmpFunction = transitionFinishFn;
             transitionFinishFn = nullptr;
+            tmpFunction();
 
             // This callback gets destroyed here,
             // we can only return after this point.
@@ -636,11 +639,12 @@ Update Transform::updateTransitions(const TimePoint& now) {
 
 void Transform::cancelTransitions() {
     if (transitionFinishFn) {
-        transitionFinishFn();
+        std::function<void()> tmpFunction = transitionFinishFn;
+        transitionFinishFn = nullptr;
+        tmpFunction();
     }
 
     transitionFrameFn = nullptr;
-    transitionFinishFn = nullptr;
 }
 
 void Transform::setGestureInProgress(bool inProgress) {
-- 
cgit v1.2.1