diff --git a/libs/image/kis_time_range.h b/libs/image/kis_time_range.h
index 7801c12..0b1489d 100644
--- a/libs/image/kis_time_range.h
+++ b/libs/image/kis_time_range.h
@@ -63,9 +63,9 @@ public:
if (rhs.isInfinite() || isInfinite()) {
m_end = std::numeric_limits<int>::min();
} else if (!isValid()) {
- m_end = rhs.end();
+ m_end = rhs.m_end;
} else {
- m_end = std::max(m_end, rhs.end());
+ m_end = std::max(m_end, rhs.m_end);
}
return *this;
@@ -76,16 +76,16 @@ public:
return *this;
} else if (!rhs.isValid()) {
m_start = rhs.start();
- m_end = rhs.end();
+ m_end = rhs.m_end;
return *this;
} else {
m_start = std::max(m_start, rhs.start());
}
if (isInfinite()) {
- m_end = rhs.end();
+ m_end = rhs.m_end;
} else if (!rhs.isInfinite()) {
- m_end = std::min(m_end, rhs.end());
+ m_end = std::min(m_end, rhs.m_end);
}
return *this;
@@ -96,7 +96,6 @@ public:
}
inline int end() const {
- KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(!isInfinite(), m_start);
return m_end;
}
diff --git a/libs/ui/kis_animation_frame_cache.cpp b/libs/ui/kis_animation_frame_cache.cpp
index f377acf..68860a5 100644
--- a/libs/ui/kis_animation_frame_cache.cpp
+++ b/libs/ui/kis_animation_frame_cache.cpp
@@ -346,6 +346,7 @@ void KisAnimationFrameCache::addConvertedFrameData(KisOpenGLUpdateInfoSP info, i
void KisAnimationFrameCache::dropLowQualityFrames(const KisTimeRange &range, const QRect ®ionOfInterest, const QRect &minimalRect)
{
+ KIS_SAFE_ASSERT_RECOVER_RETURN(!range.isInfinite());
if (m_d->newFrames.isEmpty()) return;
auto it = m_d->newFrames.upperBound(range.start());
@@ -375,6 +376,7 @@ void KisAnimationFrameCache::dropLowQualityFrames(const KisTimeRange &range, con
bool KisAnimationFrameCache::framesHaveValidRoi(const KisTimeRange &range, const QRect ®ionOfInterest)
{
+ KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(!range.isInfinite(), false);
if (m_d->newFrames.isEmpty()) return false;
auto it = m_d->newFrames.upperBound(range.start());