Merge to fix #2417

This commit is contained in:
Rebecca Cox 2018-01-29 16:04:41 +01:00
commit a5dd38969f

View File

@ -215,7 +215,7 @@ void RimWellLogExtractionCurve::setPropertiesFromView(Rim3dView* view)
//--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurve::clampTimestep()
{
if (m_case)
if (m_timeStep > 0 && m_case)
{
if (m_timeStep > m_case->timeStepStrings().size() - 1)
{
@ -814,7 +814,7 @@ QString RimWellLogExtractionCurve::wellDate() const
}
}
return (m_timeStep < timeStepNames.size()) ? timeStepNames[m_timeStep] : "";
return (m_timeStep >= 0 && m_timeStep < timeStepNames.size()) ? timeStepNames[m_timeStep] : "";
}
//--------------------------------------------------------------------------------------------------