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

#4351 Regression test : Guard null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad
2019-04-24 07:41:11 +02:00
parent 195fc85a5a
commit 5123d5d0c5
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@@ -465,15 +465,19 @@ RimWellPathCollection* Rim3dView::wellPathCollection() const
//--------------------------------------------------------------------------------------------------
bool Rim3dView::hasVisibleTimeStepDependent3dWellLogCurves() const
{
std::vector<Rim3dWellLogCurve*> wellLogCurves;
wellPathCollection()->descendantsIncludingThisOfType(wellLogCurves);
for (const Rim3dWellLogCurve* curve : wellLogCurves)
if (wellPathCollection())
{
if (curve->showInView(this) && curve->isShowingTimeDependentResult())
std::vector<Rim3dWellLogCurve*> wellLogCurves;
wellPathCollection()->descendantsIncludingThisOfType(wellLogCurves);
for (const Rim3dWellLogCurve* curve : wellLogCurves)
{
return true;
if (curve->showInView(this) && curve->isShowingTimeDependentResult())
{
return true;
}
}
}
return false;
}

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1717,7 +1717,7 @@ bool RimEclipseView::isTimeStepDependentDataVisible() const
if (this->faultResultSettings()->customFaultResult()->isTernarySaturationSelected()) return true;
}
if (this->wellPathCollection()->anyWellsContainingPerforationIntervals()) return true;
if (this->wellPathCollection() && this->wellPathCollection()->anyWellsContainingPerforationIntervals()) return true;
if (this->hasVisibleTimeStepDependent3dWellLogCurves()) return true;

2
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -1638,7 +1638,7 @@ void RiuMainWindow::refreshDrawStyleActions()
if (!eclView)
{
Rim2dIntersectionView* intView = dynamic_cast<Rim2dIntersectionView*>(view);
if (intView)
if (intView && intView->intersection())
{
intView->intersection()->firstAncestorOrThisOfType(eclView);
}