From 91cd27d589ee9c87dcb04f7219b40580276b9b42 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 18 Dec 2019 11:57:39 +0100 Subject: [PATCH] #5251 Comparison View : Guard null pointer access --- .../Commands/ViewLink/RicRemoveComparison3dViewFeature.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/Commands/ViewLink/RicRemoveComparison3dViewFeature.cpp b/ApplicationCode/Commands/ViewLink/RicRemoveComparison3dViewFeature.cpp index 3a59493be7..45d32be1b8 100644 --- a/ApplicationCode/Commands/ViewLink/RicRemoveComparison3dViewFeature.cpp +++ b/ApplicationCode/Commands/ViewLink/RicRemoveComparison3dViewFeature.cpp @@ -36,7 +36,8 @@ public: bool makeReady() { m_activeView = RiaApplication::instance()->activeReservoirView(); - if ( m_activeView && m_activeView->viewer()->viewerCommands()->isCurrentPickInComparisonView() ) + if ( m_activeView && m_activeView->viewer() && m_activeView->viewer()->viewerCommands() && + m_activeView->viewer()->viewerCommands()->isCurrentPickInComparisonView() ) { return true; }