Change order of finish function, to stop infinite loop

1 files changed, 5 insertions, 1 deletions

diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 105adf0400..f85272929f 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -595,12 +595,16 @@ void Transform::startTransition(const CameraOptions& camera,
             }
             observer.onCameraIsChanging();
         } else {
-            transitionFinishFn();
+            auto finish = transitionFinishFn;
+
             transitionFinishFn = nullptr;
 
             // This callback gets destroyed here,
             // we can only return after this point.
             transitionFrameFn = nullptr;
+
+            if (finish)
+                finish();
         }
     };