Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/mbgl/map/map.cpp

1 files changed, 8 insertions, 1 deletions

diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 1118bc23a7..e8197dabcd 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -188,7 +188,11 @@ void GLFWView::key(GLFWwindow *window, int key, int /*scancode*/, int action, in
         case GLFW_KEY_R:
             if (!mods) {
                 view->map->setDefaultTransitionDuration(300);
-                view->map->toggleClass("night");
+                if (view->map->hasClass("night")) {
+                    view->map->removeClass("night");
+                } else {
+                    view->map->addClass("night");
+                }
             }
             break;
         case GLFW_KEY_N:
@@ -286,6 +290,9 @@ int GLFWView::run() {
         glfwWaitEvents();
     });
 
+    // Terminate here to save binary shaders
+    map->terminate();
+
     return 0;
 }