Tweaked pointer checks.

2 files changed, 6 insertions, 3 deletions

diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp
index f137afdeeb..410a408d1b 100644
--- a/src/mbgl/renderer/layers/render_custom_layer.cpp
+++ b/src/mbgl/renderer/layers/render_custom_layer.cpp
@@ -16,7 +16,7 @@ RenderCustomLayer::RenderCustomLayer(Immutable<style::CustomLayer::Impl> _impl)
 
 RenderCustomLayer::~RenderCustomLayer() {
     assert(BackendScope::exists());
-    if (initialized && impl().context.get()) {
+    if (initialized && impl().context) {
 
         if (contextDestroyed) {
             impl().context->lost();
@@ -57,14 +57,14 @@ std::unique_ptr<Bucket> RenderCustomLayer::createBucket(const BucketParameters&,
 void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) {
     if (context != impl().context || !initialized) {
 
-        if (!contextDestroyed && context.get()) {
+        if (!contextDestroyed && context) {
             context->deinitialize();
             context->detach();
         }
 
         context = impl().context;
 
-        if (context.get()) {
+        if (context) {
             context->attach();
             context->initialize();
         }
diff --git a/src/mbgl/style/layers/custom_layer_impl.cpp b/src/mbgl/style/layers/custom_layer_impl.cpp
index 3fdeb156a2..97a7bba78f 100644
--- a/src/mbgl/style/layers/custom_layer_impl.cpp
+++ b/src/mbgl/style/layers/custom_layer_impl.cpp
@@ -14,6 +14,9 @@ CustomLayer::Impl::Impl(const std::string& id_,
 }
 
 void CustomLayer::Impl::didSetObserver(bool didSet) const {
+    if (!context)
+        return;
+
     if (didSet) {
         context->attach();
     }