diff options
| author | Leith Bade <leith@mapbox.com> | 2014-11-19 20:13:37 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-11-19 20:13:37 +1100 |
| commit | 69d42411ab10e352d16ebb618d94170edc9e7af8 (patch) | |
| tree | 2a7bf169796a9e25b47e88e7d407a5fb4a3749d7 /android/cpp | |
| parent | e52cf05ac3f404762988fcbda9bc3d4facb417e1 (diff) | |
| download | qtlocation-mapboxgl-69d42411ab10e352d16ebb618d94170edc9e7af8.tar.gz | |
Fix hand/crash in pause when rotating screen
Diffstat (limited to 'android/cpp')
| -rw-r--r-- | android/cpp/native_map_view.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp index 7a04688b08..3997d91763 100644 --- a/android/cpp/native_map_view.cpp +++ b/android/cpp/native_map_view.cpp @@ -541,20 +541,18 @@ void NativeMapView::loadExtensions() { void NativeMapView::stop() { mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::stop"); - assert(display != EGL_NO_DISPLAY); - assert(context != EGL_NO_CONTEXT); - - map.stop(); + if ((display != EGL_NO_DISPLAY) && (display != EGL_NO_CONTEXT)) { + map.stop(); + } } void NativeMapView::pause(bool wait_for_pause) { mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause %s", (wait_for_pause) ? "true" : "false"); - assert(display != EGL_NO_DISPLAY); - assert(context != EGL_NO_CONTEXT); - - map.pause(wait_for_pause); + if ((display != EGL_NO_DISPLAY) && (display != EGL_NO_CONTEXT)) { + map.pause(wait_for_pause); + } } void NativeMapView::resume() { |