From 1d957d6898bdaddea5e8cce63ef9b25c78515358 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 29 Apr 2015 17:11:15 -0400
Subject: [PATCH] Deactivate after cleanup

---
 src/mbgl/map/map_context.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 6640fddd9..9e5076ff6 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -58,7 +58,6 @@ MapContext::MapContext(uv_loop_t* loop, View& view_, FileSource& fileSource, Map
 }
 
 MapContext::~MapContext() {
-    view.deactivate();
     view.notify();
 
     // Explicit resets currently necessary because these abandon resources that need to be
@@ -73,6 +72,8 @@ MapContext::~MapContext() {
     glyphStore.reset();
 
     env.performCleanup();
+
+    view.deactivate();
 }
 
 void MapContext::pause() {