From 7a4c914d05cab81ca55ac3cde478997c6d32477e Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@leithalweapon.geek.nz>
Date: Tue, 24 Jun 2014 16:19:47 +1000
Subject: [PATCH] Move notify_map_change() from a global callback, to a
 callback in View.

This allows for their to me more than one Map object alive at a
time.

Fixes mapbox/mapbox-gl-native#346

Conflicts:
	common/glfw_view.hpp
	include/llmr/map/view.hpp
	include/mbgl/map/transform.hpp
	src/map/map.cpp
	src/map/transform.cpp
	test/headless.cpp
---
 src/map/map.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/map/map.cpp b/src/map/map.cpp
index 00f0ac91c..e6c4e9d03 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -156,7 +156,6 @@ void Map::cleanup(uv_async_t *async) {
 void Map::terminate() {
     view.make_active();
     painter.terminate();
-    view.make_inactive();
 }
 
 void Map::render(uv_async_t *async) {