gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

TW-252

Browse Source 
- TW-252 task done - Doesn't stop task before marking complete (thanks to
         Renato Alves).
This commit is contained in:
Paul Beckingham
2014-07-06 00:47:53 -04:00
parent 75af8d6ca4
commit 5697270ecf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -44,6 +44,8 @@
- TW-250 Opening parenthesis in description gets padded in task 2.0.0 bet 2 - TW-250 Opening parenthesis in description gets padded in task 2.0.0 bet 2
(thanks to Michelle Crane). (thanks to Michelle Crane).
- TW-251 extra spaces added after ( and / (thanks to Andy Spiegl). - TW-251 extra spaces added after ( and / (thanks to Andy Spiegl).
- TW-252 task done - Doesn't stop task before marking complete (thanks to
Renato Alves).
- TW-253 Unrecognized taskwarrior file format. in - TW-253 Unrecognized taskwarrior file format. in
/Users/user/Dropbox/.task/completed.data at line 1 (thanks to Kosta /Users/user/Dropbox/.task/completed.data at line 1 (thanks to Kosta
Harlan). Harlan).

9
src/commands/CmdDone.cpp
View File

@@ -85,9 +85,12 @@ int CmdDone::execute (std::string& output)
task->setEnd (); task->setEnd ();
// Stop the task, if started. // Stop the task, if started.
if (task->has ("start") && if (task->has ("start"))
context.config.getBoolean ("journal.time")) {
task->addAnnotation (context.config.get ("journal.time.stop.annotation")); task->remove ("start");
if (context.config.getBoolean ("journal.time"))
task->addAnnotation (context.config.get ("journal.time.stop.annotation"));
}
if (permission (*task, taskDifferences (before, *task) + question, filtered.size ())) if (permission (*task, taskDifferences (before, *task) + question, filtered.size ()))
{ {