From 169944641f8304a8af9732ec5293e48c80c748bf Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 14 Oct 2016 11:52:09 +0200
Subject: [PATCH] Guard against accessing null pointer

---
 .../RimEclipseResultDefinition.cpp                | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
index ab81bbcc86..1d5116e131 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
@@ -83,16 +83,23 @@ void RimEclipseResultDefinition::setEclipseCase(RimEclipseCase* eclipseCase)
      updateFieldVisibility();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
 QStringList RimEclipseResultDefinition::getResultVariableListForCurrentUIFieldSettings()
 {
-    if (!m_eclipseCase  ) return QStringList();
+    RimReservoirCellResultsStorage* cellResultsStorage = currentGridCellResults();
 
-    RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(m_porosityModelUiField());
+    if (!cellResultsStorage) return QStringList();
 
-    return m_eclipseCase->results(porosityModel)->cellResults()->resultNames(m_resultTypeUiField());
+    if (!cellResultsStorage->cellResults()) return QStringList();
+
+    return cellResultsStorage->cellResults()->resultNames(m_resultTypeUiField());
 }
 
-
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
 RimReservoirCellResultsStorage* RimEclipseResultDefinition::currentGridCellResults() const
 {
     if (!m_eclipseCase ) return NULL;