[android] Refcount the view activations

Fixes #5836 Fixes #5721
mapbox · Aug 5, 2016 · 45c5e04 · 45c5e04
1 parent cf047b4
commit 45c5e04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
@@ -125,6 +125,10 @@ std::array<uint16_t, 2> NativeMapView::getFramebufferSize() const {
 }
 
 void NativeMapView::activate() {
+    if (active++) {
+        return;
+    }
+
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::activate");
 
     oldDisplay = eglGetCurrentDisplay();
@@ -151,6 +155,10 @@ void NativeMapView::activate() {
 }
 
 void NativeMapView::deactivate() {
+    if (--active) {
+        return;
+    }
+
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::deactivate");
 
     assert(vm != nullptr);

diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
@@ -97,6 +97,8 @@ class NativeMapView : public mbgl::View, private mbgl::util::noncopyable {
     std::unique_ptr<mbgl::DefaultFileSource> fileSource;
     std::unique_ptr<mbgl::Map> map;
     mbgl::EdgeInsets insets;
+
+    unsigned active = 0;
 };
 }
 }