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

#947 Linked views : Guard against null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad
2016-11-02 12:23:41 +01:00
parent d2d9d43ca1
commit 40ebd04f60
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -873,9 +873,11 @@ bool RimViewController::isPropertyFilterOveridden()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRangeFilter) void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRangeFilter)
{ {
if (!m_managedView) return;
if (!isRangeFiltersControlled()) if (!isRangeFiltersControlled())
{ {
managedView()->setOverrideRangeFilterCollection(NULL); m_managedView->setOverrideRangeFilterCollection(NULL);
return; return;
} }
@@ -930,10 +932,8 @@ void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRa
} }
} }
managedView()->setOverrideRangeFilterCollection(overrideRangeFilterColl); m_managedView->setOverrideRangeFilterCollection(overrideRangeFilterColl);
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -941,6 +941,8 @@ void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimViewController::applyRangeFilterCollectionByUserChoice() void RimViewController::applyRangeFilterCollectionByUserChoice()
{ {
if (!m_managedView) return;
if (!m_managedView->hasOverridenRangeFilterCollection()) if (!m_managedView->hasOverridenRangeFilterCollection())
{ {
return; return;