From 9ad8b6ce69ed0dde66006d978200724433904a1c Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 10 May 2021 14:11:08 +0200 Subject: [PATCH] #7671 StimPlan XML import: fix unit system assert on missing file. --- .../Completions/RimStimPlanFractureTemplate.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp index feb0c7b089..6da3757e01 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp @@ -308,7 +308,6 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate() } else { - setUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ); m_readError = true; } @@ -818,7 +817,13 @@ void RimStimPlanFractureTemplate::convertToUnitSystem( RiaDefines::EclipseUnitSy m_readError = false; loadDataAndUpdate(); - if ( m_stimPlanFractureDefinitionData.isNull() ) return; + if ( m_stimPlanFractureDefinitionData.isNull() ) + { + m_readError = true; + // Force needed unit system when file reading fails to be able to open the project. + setUnitSystem( neededUnit ); + return; + } if ( neededUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD ) {