From ea28cb573389a981b97f39bc33d196bb925c319f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronsolutions.com>
Date: Fri, 8 Nov 2019 11:23:06 +0100
Subject: [PATCH] #4869 Fixed range filter commands on inactive view

---
 .../Commands/RicRangeFilterFeatureImpl.cpp    | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp b/ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
index c6d5ceb02c..ef82d817b1 100644
--- a/ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterFeatureImpl.cpp
@@ -70,29 +70,17 @@ RicRangeFilterNewExec* RicRangeFilterFeatureImpl::createRangeFilterExecCommand()
 RimCellRangeFilterCollection* RicRangeFilterFeatureImpl::findRangeFilterCollection()
 {
     RimCellRangeFilterCollection* rangeFilterCollection = nullptr;
+    
+    rangeFilterCollection = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimCellRangeFilterCollection>();
 
-    std::vector<RimCellRangeFilter*> selectedRangeFilter;
-    caf::SelectionManager::instance()->objectsByType( &selectedRangeFilter );
-
-    std::vector<RimCellRangeFilterCollection*> selectedRangeFilterCollection;
-    caf::SelectionManager::instance()->objectsByType( &selectedRangeFilterCollection );
-
-    if ( selectedRangeFilterCollection.size() == 1 )
+    if ( !rangeFilterCollection )
     {
-        rangeFilterCollection = selectedRangeFilterCollection[0];
+        RimGridView* view = RiaApplication::instance()->activeMainOrComparisonGridView();
+        if ( view )
+        {
+            rangeFilterCollection = view->rangeFilterCollection();
+        }
     }
-    else if ( selectedRangeFilter.size() > 0 )
-    {
-        selectedRangeFilter[0]->firstAncestorOrThisOfType( rangeFilterCollection );
-    }
-
-    RimGridView* view = RiaApplication::instance()->activeGridView();
-    if ( view )
-    {
-        rangeFilterCollection = view->rangeFilterCollection();
-    }
-
-    assert( rangeFilterCollection );
 
     return rangeFilterCollection;
 }