Merge pull request #2179 from mapbox/node

Node bindings

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index a8dd86284f..17d3a87ccc 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -259,7 +259,7 @@ void MapContext::update() {
         updateFlags = Update::Nothing;
     }
 
-    if (updateFlags == Update::Nothing) {
+    if (updateFlags == Update::Nothing || (data.mode == MapMode::Still && !callback)) {
         return;
     }
 
@@ -326,6 +326,8 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
         return false;
     }
 
+    view.beforeRender();
+
     transformState = state;
 
     // Cleanup OpenGL objects that we abandoned since the last render call.
@@ -344,7 +346,7 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
         callback = nullptr;
     }
 
-    view.swap();
+    view.afterRender();
     viewInvalidated = false;
     data.setNeedsRepaint(style->hasTransitions() || painter->needsAnimation());