From 40ebd04f60bb7ca20a2886693b9aee2a1d583cc0 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Wed, 2 Nov 2016 12:23:41 +0100
Subject: [PATCH] #947 Linked views : Guard against null pointer access

---
 ApplicationCode/ProjectDataModel/RimViewController.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimViewController.cpp b/ApplicationCode/ProjectDataModel/RimViewController.cpp
index 7b4338b807..e016374774 100644
--- a/ApplicationCode/ProjectDataModel/RimViewController.cpp
+++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp
@@ -873,9 +873,11 @@ bool RimViewController::isPropertyFilterOveridden()
 //--------------------------------------------------------------------------------------------------
 void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRangeFilter)
 {
+    if (!m_managedView) return;
+
     if (!isRangeFiltersControlled())
     {
-        managedView()->setOverrideRangeFilterCollection(NULL);
+        m_managedView->setOverrideRangeFilterCollection(NULL);
 
         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()
 {
+    if (!m_managedView) return;
+
     if (!m_managedView->hasOverridenRangeFilterCollection())
     {
         return;