From 1f2bea106f223aece499cdf9371e349a96928ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Tue, 21 Apr 2015 08:37:32 +0200
Subject: [PATCH] Small guard RiuViewer

---
 ApplicationCode/UserInterface/RiuViewer.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp
index ece963d70a..dc6fd634ed 100644
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@@ -139,9 +139,11 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
 //--------------------------------------------------------------------------------------------------
 RiuViewer::~RiuViewer()
 {
-    m_reservoirView->showWindow = false;
-    m_reservoirView->cameraPosition = m_mainCamera->viewMatrix();
-
+    if (m_reservoirView)
+    {
+        m_reservoirView->showWindow = false;
+        m_reservoirView->cameraPosition = m_mainCamera->viewMatrix();
+    }
     delete m_InfoLabel;
     delete m_animationProgress;
     delete m_histogramWidget;