From 69d42411ab10e352d16ebb618d94170edc9e7af8 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Wed, 19 Nov 2014 20:13:37 +1100
Subject: [PATCH] Fix hand/crash in pause when rotating screen

---
 android/cpp/native_map_view.cpp | 14 ++++++--------
 src/map/map.cpp                 |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
index 7a04688b0..3997d9176 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() {
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 3746fb4b6..a12cba00b 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -429,6 +429,7 @@ void Map::setStyleJSON(std::string newStyleJSON, const std::string &base) {
     if (!style) {
         style = std::make_shared<Style>();
     }
+
     style->loadJSON((const uint8_t *)styleJSON.c_str());
     if (!fileSource) {
         fileSource = std::make_shared<FileSource>(**loop, platform::defaultCacheDatabase());