summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-05-04 18:27:48 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-05-04 18:27:48 -0700
commit00a1f44cfc4a379af0894638774eba0173d44960 (patch)
treec773cb494d9eef7ffb7bfd905da75fd587847029 /android
parentda8aaa2114f4bbc8d0b2ee8308e440f0b7e8c4fa (diff)
downloadqtlocation-mapboxgl-00a1f44cfc4a379af0894638774eba0173d44960.tar.gz
Ensure no GL commands are executed after pause
Diffstat (limited to 'android')
-rw-r--r--android/cpp/native_map_view.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
index 5f6b078a71..327d1dc598 100644
--- a/android/cpp/native_map_view.cpp
+++ b/android/cpp/native_map_view.cpp
@@ -360,7 +360,7 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
void NativeMapView::destroySurface() {
mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::destroySurface");
- pause(true);
+ pause();
if (surface != EGL_NO_SURFACE) {
if (!eglDestroySurface(display, surface)) {
@@ -674,12 +674,11 @@ void loadExtensions() {
}
}
-void NativeMapView::pause(bool waitForPause) {
- mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause %s",
- (waitForPause) ? "true" : "false");
+void NativeMapView::pause() {
+ mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause");
if ((display != EGL_NO_DISPLAY) && (context != EGL_NO_CONTEXT)) {
- map.pause(waitForPause);
+ map.pause();
}
}