Correctly clamp frame numbers so that invalid frames are not possible

qgis · Mar 12, 2020 · 6eaefb6 · 6eaefb6
1 parent fb13b0f
commit 6eaefb6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/qgstemporalnavigationobject.cpp b/src/core/qgstemporalnavigationobject.cpp
@@ -81,7 +81,7 @@ void QgsTemporalNavigationObject::setCurrentFrameNumber( long long frameNumber )
 {
   if ( mCurrentFrameNumber != frameNumber )
   {
-    mCurrentFrameNumber = frameNumber;
+    mCurrentFrameNumber = std::max( 0LL, std::min( frameNumber, totalFrameCount() - 1 ) );
     QgsDateTimeRange range = dateTimeRangeForFrameNumber( mCurrentFrameNumber );
     emit updateTemporalRange( range );
   }
@@ -157,7 +157,7 @@ void QgsTemporalNavigationObject::rewindToStart()
 
 void QgsTemporalNavigationObject::skipToEnd()
 {
-  const long long frame = totalFrameCount();
+  const long long frame = totalFrameCount() - 1;
   setCurrentFrameNumber( frame );
 }