GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix corner cases in startsWithin/endsWithin

Browse source
This commit is contained in:
Thomas Lauf 2018-09-18 06:44:26 +02:00
parent bd65b67248
commit 1a54bb5c37
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Range.cpp
View file

@ -102,7 +102,7 @@ bool Range::is_empty () const
////////////////////////////////////////////////////////////////////////////////
bool Range::contains (const Datetime &datetime) const
{
return (! is_started () || start <= datetime) &&
return (! is_started () || start < datetime) &&
(! is_ended () || datetime < end);
}
@ -193,7 +193,7 @@ bool Range::startsWithin (const Range& other) const
return !other.is_started ();
}
return other.contains (start);
return other.start == start || other.contains (start);
}
////////////////////////////////////////////////////////////////////////////////
@ -209,7 +209,7 @@ bool Range::endsWithin (const Range& other) const
return !other.is_ended ();
}
return other.contains (end);
return other.end == end || other.contains (end);
}
////////////////////////////////////////////////////////////////////////////////