diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 156bf9684b..36f311c6cf 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -272,7 +272,7 @@ void RimReservoirView::updateViewerWidgetWindowTitle() void RimReservoirView::clampCurrentTimestep() { // Clamp the current timestep to actual possibilities - if (this->currentGridCellResults()->cellResults()) + if (this->currentGridCellResults() && this->currentGridCellResults()->cellResults()) { if (m_currentTimeStep() >= static_cast(this->currentGridCellResults()->cellResults()->maxTimeStepCount())) { diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp index 6016b2a3a5..04fb06f035 100644 --- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp @@ -166,9 +166,9 @@ bool RimResultDefinition::hasResult() const { if (m_gridScalarResultIndex != cvf::UNDEFINED_SIZE_T) return true; - const RigCaseCellResultsData* gridCellResults = m_reservoirView->currentGridCellResults()->cellResults(); - if (gridCellResults) + if (m_reservoirView->currentGridCellResults() && m_reservoirView->currentGridCellResults()->cellResults()) { + const RigCaseCellResultsData* gridCellResults = m_reservoirView->currentGridCellResults()->cellResults(); m_gridScalarResultIndex = gridCellResults->findScalarResultIndex(resultType(), resultVariable()); return m_gridScalarResultIndex != cvf::UNDEFINED_SIZE_T; } @@ -182,8 +182,6 @@ bool RimResultDefinition::hasResult() const //-------------------------------------------------------------------------------------------------- bool RimResultDefinition::hasDynamicResult() const { - const RigCaseCellResultsData* gridCellResults = m_reservoirView->currentGridCellResults()->cellResults(); - if (hasResult()) { if (resultType() == RimDefines::DYNAMIC_NATIVE) @@ -191,9 +189,13 @@ bool RimResultDefinition::hasDynamicResult() const return true; } - if (gridCellResults->timeStepCount(m_gridScalarResultIndex) > 1 ) + if (m_reservoirView->currentGridCellResults() && m_reservoirView->currentGridCellResults()->cellResults()) { - return true; + const RigCaseCellResultsData* gridCellResults = m_reservoirView->currentGridCellResults()->cellResults(); + if (gridCellResults->timeStepCount(m_gridScalarResultIndex) > 1 ) + { + return true; + } } }