OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Guard against accessing null pointer

Browse Source
This commit is contained in:
Magne Sjaastad 2016-10-14 11:52:09 +02:00
parent 706241db5c
commit 169944641f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -83,16 +83,23 @@ void RimEclipseResultDefinition::setEclipseCase(RimEclipseCase* eclipseCase)
updateFieldVisibility(); updateFieldVisibility();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RimEclipseResultDefinition::getResultVariableListForCurrentUIFieldSettings() 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 RimReservoirCellResultsStorage* RimEclipseResultDefinition::currentGridCellResults() const
{ {
if (!m_eclipseCase ) return NULL; if (!m_eclipseCase ) return NULL;