mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
Bug #987
- Fixed bug #987, so that total active time does not continue to accumulate after an active task is completed. Signed-off-by: Paul Beckingham <paul@beckingham.net>
This commit is contained in:
parent
8cbacdacf7
commit
b4d09d1c30
2 changed files with 8 additions and 3 deletions
|
@ -22,6 +22,8 @@ Bugs
|
||||||
Spiegl).
|
Spiegl).
|
||||||
+ Fixed bug #986, so that the 'info' report uses the correct date format
|
+ Fixed bug #986, so that the 'info' report uses the correct date format
|
||||||
(thanks to Louis-Claude Canon).
|
(thanks to Louis-Claude Canon).
|
||||||
|
+ Applied patch for bug #987, so that total active time does not continue to
|
||||||
|
accumulate after an active task is completed (thanks to Louis-Claude Canon).
|
||||||
+ Fixed bug #988, updating the documentation so that 'undo.data' usage is more
|
+ Fixed bug #988, updating the documentation so that 'undo.data' usage is more
|
||||||
clearly stated (thanks to Louis-Claude Canon).
|
clearly stated (thanks to Louis-Claude Canon).
|
||||||
+ Fixed grammar in feedback string (thanks to Uli Martens).
|
+ Fixed grammar in feedback string (thanks to Uli Martens).
|
||||||
|
|
|
@ -401,10 +401,13 @@ int CmdInfo::execute (std::string& output)
|
||||||
// task started
|
// task started
|
||||||
total_time -= timestamp.toEpoch ();
|
total_time -= timestamp.toEpoch ();
|
||||||
}
|
}
|
||||||
else if (before.get ("start") != ""
|
else if (((before.get ("start") != "" &&
|
||||||
&& after.get ("start") == "")
|
after.get ("start") == "") ||
|
||||||
|
(before.get ("status") != "completed" &&
|
||||||
|
after.get ("status") == "completed")) &&
|
||||||
|
total_time < 0)
|
||||||
{
|
{
|
||||||
// task stopped
|
// task stopped or done
|
||||||
total_time += timestamp.toEpoch ();
|
total_time += timestamp.toEpoch ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue