From 930760eb4712baf2bdecf0dbe03b2439bf3ecc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Fri, 14 Aug 2015 13:21:04 +0200
Subject: [PATCH] Removed wrong usage of owner()

---
 ApplicationCode/Commands/RicRangeFilterHelper.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/Commands/RicRangeFilterHelper.cpp b/ApplicationCode/Commands/RicRangeFilterHelper.cpp
index 9ac0e493f5..f4dbb8baf2 100644
--- a/ApplicationCode/Commands/RicRangeFilterHelper.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterHelper.cpp
@@ -43,7 +43,6 @@ RicRangeFilterNewExec* RicRangeFilterHelper::createRangeFilterExecCommand()
     RimCellRangeFilterCollection* rangeFilterCollection = findRangeFilterCollection();
 
     RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);
-    assert(rangeFilterCollection);
 
     return filterExec;
 }
@@ -54,22 +53,26 @@ RicRangeFilterNewExec* RicRangeFilterHelper::createRangeFilterExecCommand()
 RimCellRangeFilterCollection* RicRangeFilterHelper::findRangeFilterCollection()
 {
     RimCellRangeFilterCollection* rangeFilterCollection = NULL;
-
+    
     std::vector<RimCellRangeFilter*> selectedRangeFilter;
     caf::SelectionManager::instance()->objectsByType(&selectedRangeFilter);
 
     std::vector<RimCellRangeFilterCollection*> selectedRangeFilterCollection;
     caf::SelectionManager::instance()->objectsByType(&selectedRangeFilterCollection);
+
     if (selectedRangeFilterCollection.size() == 1)
     {
         rangeFilterCollection = selectedRangeFilterCollection[0];
     }
     else if (selectedRangeFilter.size() > 0)
     {
-        rangeFilterCollection = dynamic_cast<RimCellRangeFilterCollection*>(selectedRangeFilter[0]->owner());
+        selectedRangeFilter[0]->firstAncestorOfType(rangeFilterCollection);
     }
 
+    assert(rangeFilterCollection);
+
     // TODO : When a menu is created in the 3D view, add code to find collection based on a RimView
+    // See RiuViewerCommands
 
     return rangeFilterCollection;
 }