From 0ac2b35fe2084c141fed604db20076c6ebf19a0b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 2 Nov 2018 15:49:13 +0100 Subject: [PATCH] 2D contour map : Guard null pointer access --- ApplicationCode/ProjectDataModel/RimGeoMechView.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index 6ac04a2d6f..7307e3d7c4 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -717,7 +717,10 @@ void RimGeoMechView::scheduleGeometryRegen(RivCellSetEnum geometryType) void RimGeoMechView::setOverridePropertyFilterCollection(RimGeoMechPropertyFilterCollection* pfc) { m_overridePropertyFilterCollection = pfc; - m_propertyFilterCollection->isActive = m_overridePropertyFilterCollection->isActive; + if (m_overridePropertyFilterCollection) + { + m_propertyFilterCollection->isActive = m_overridePropertyFilterCollection->isActive; + } m_propertyFilterCollection.uiCapability()->updateConnectedEditors(); this->scheduleGeometryRegen(PROPERTY_FILTERED);