Delete the GLFWView object at exit

Also destroy the glfwWindow we create. This leak was probably harmless
but a nice cleanup helps us debug other serious memory leaks.

2 files changed, 4 insertions, 2 deletions

diff --git a/linux/main.cpp b/linux/main.cpp
index 697941164a..4d5474c02f 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -1,4 +1,5 @@
 #include <mbgl/mbgl.hpp>
+#include <mbgl/util/std.hpp>
 #include <mbgl/util/uv.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
@@ -13,7 +14,7 @@
 #include <sstream>
 
 
-GLFWView *view = nullptr;
+std::unique_ptr<GLFWView> view;
 
 void quit_handler(int) {
     if (view) {
@@ -62,7 +63,7 @@ int main(int argc, char *argv[]) {
     sigIntHandler.sa_flags = 0;
     sigaction(SIGINT, &sigIntHandler, NULL);
 
-    view = new GLFWView();
+    view = mbgl::util::make_unique<GLFWView>();
 
     mbgl::SQLiteCache cache("/tmp/mbgl-cache.db");
     mbgl::DefaultFileSource fileSource(&cache);
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 601ae0ec2d..fd9c701f92 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -11,6 +11,7 @@ GLFWView::GLFWView(bool fullscreen_) : fullscreen(fullscreen_) {
 }
 
 GLFWView::~GLFWView() {
+    glfwDestroyWindow(window);
     glfwTerminate();
 }