From 80ee31edd95da1a86dab5b03de059f0bf1e4ccc0 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 29 Jul 2015 11:00:00 -0700
Subject: [PATCH] Address crashes on exit

---
 .../display-plugins/WindowOpenGLDisplayPlugin.cpp  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/WindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/WindowOpenGLDisplayPlugin.cpp
index 0ae72d3388..ca8a09f77f 100644
--- a/libraries/display-plugins/src/display-plugins/WindowOpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/WindowOpenGLDisplayPlugin.cpp
@@ -14,15 +14,23 @@ WindowOpenGLDisplayPlugin::WindowOpenGLDisplayPlugin() {
 }
 
 glm::uvec2 WindowOpenGLDisplayPlugin::getRecommendedRenderSize() const {
-    return toGlm(_window->geometry().size() * _window->devicePixelRatio());
+    uvec2 result;
+    if (_window) {
+        result = toGlm(_window->geometry().size() * _window->devicePixelRatio());
+    }
+    return result;
 }
 
 glm::uvec2 WindowOpenGLDisplayPlugin::getRecommendedUiSize() const {
-    return toGlm(_window->geometry().size());
+    uvec2 result;
+    if (_window) {
+        result = toGlm(_window->geometry().size());
+    }
+    return result;
 }
 
 bool WindowOpenGLDisplayPlugin::hasFocus() const {
-    return _window->isActive();
+    return _window ? _window->isActive() : false;
 }
 
 void WindowOpenGLDisplayPlugin::initSurfaceFormat(QSurfaceFormat& format) {