From 018aea4f58ae7484804d6bd8cf797333f6ed4589 Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Wed, 13 Sep 2017 09:52:08 +0200 Subject: [PATCH] Add guard against null pointer access --- .../Commands/RicConvertFractureTemplateUnitFeature.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp b/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp index 873d53229d..c0e81c537a 100644 --- a/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp +++ b/ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp @@ -68,9 +68,6 @@ void RicConvertFractureTemplateUnitFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- void RicConvertFractureTemplateUnitFeature::setupActionLook(QAction* actionToSetup) { - actionToSetup->setIcon(QIcon(":/FractureTemplate16x16.png")); - //TODO: Add unit to text - caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem(); if (!pdmUiItem) return; @@ -79,6 +76,7 @@ void RicConvertFractureTemplateUnitFeature::setupActionLook(QAction* actionToSet RimEllipseFractureTemplate* ellipseFractureTemplate = nullptr; objHandle->firstAncestorOrThisOfType(ellipseFractureTemplate); + if (!ellipseFractureTemplate) return; QString text = "Convert Values to "; if (ellipseFractureTemplate->fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC) @@ -90,6 +88,9 @@ void RicConvertFractureTemplateUnitFeature::setupActionLook(QAction* actionToSet text += "Metric"; } + actionToSetup->setIcon(QIcon(":/FractureTemplate16x16.png")); + //TODO: Add unit to text + actionToSetup->setText(text); }