Address crashes on exit

This commit is contained in:
Bradley Austin Davis 2015-07-29 11:00:00 -07:00
parent 900c2c11df
commit 80ee31edd9

View file

@ -14,15 +14,23 @@ WindowOpenGLDisplayPlugin::WindowOpenGLDisplayPlugin() {
} }
glm::uvec2 WindowOpenGLDisplayPlugin::getRecommendedRenderSize() const { 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 { 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 { bool WindowOpenGLDisplayPlugin::hasFocus() const {
return _window->isActive(); return _window ? _window->isActive() : false;
} }
void WindowOpenGLDisplayPlugin::initSurfaceFormat(QSurfaceFormat& format) { void WindowOpenGLDisplayPlugin::initSurfaceFormat(QSurfaceFormat& format) {