From 1cb4201cbc25145706a6473430dec0155f897a76 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Mon, 11 Jun 2018 08:45:27 +0200
Subject: [PATCH] #3025 Fix "-1" in base time step for Geomech well log curves

---
 .../RimGeoMechResultDefinition.cpp            | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
index 60ca6d5938..1c2352daf3 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
@@ -264,6 +264,19 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
         }
     }
 
+    if (&m_isTimeLapseResultUiField == changedField)
+    {
+        m_isTimeLapseResult = m_isTimeLapseResultUiField;
+        if (m_isTimeLapseResult())
+        {
+            if (m_timeLapseBaseTimestep() == RigFemResultAddress::NO_TIME_LAPSE)
+            {
+                m_timeLapseBaseTimestep = 0;
+                m_timeLapseBaseTimestepUiField = 0;
+            }
+        }
+    }
+
     if(   &m_resultPositionTypeUiField == changedField 
        || &m_isTimeLapseResultUiField == changedField
        || &m_timeLapseBaseTimestepUiField == changedField)
@@ -583,9 +596,12 @@ void RimGeoMechResultDefinition::setResultAddress( const RigFemResultAddress& re
     m_resultVariableUiField = composeFieldCompString(m_resultFieldName(), m_resultComponentName());
 
     m_isTimeLapseResult     = resultAddress.isTimeLapse();
-    m_timeLapseBaseTimestep = m_isTimeLapseResult ? resultAddress.timeLapseBaseFrameIdx : -1;
-
     m_isTimeLapseResultUiField = m_isTimeLapseResult;
+
+    if (m_isTimeLapseResult)
+    {
+        m_timeLapseBaseTimestep = resultAddress.timeLapseBaseFrameIdx;
+    }
     m_timeLapseBaseTimestepUiField = m_timeLapseBaseTimestep;
 
     m_compactionRefLayer = resultAddress.refKLayerIndex;