T.83.5: Fix 'M'erge giving bogus time when a marked entry is running.

This commit is contained in:
Felicity Tarnell 2014-03-06 16:21:40 +00:00
parent 4ba7155d78
commit af2b5dc45c
3 changed files with 12 additions and 14 deletions

6
tts.c
View file

@ -1317,11 +1317,9 @@ int h, m, s = 0;
TAILQ_FOREACH_SAFE(en, &entries, en_entries, ten) {
if (!en->en_flags.efl_marked || en == curent)
continue;
curent->en_secs += en->en_secs;
if (en->en_started) {
if (en->en_started)
entry_stop(en);
curent->en_secs += time(NULL) - en->en_started;
}
curent->en_secs += en->en_secs;
TAILQ_REMOVE(&entries, en, en_entries);
entry_free(en);
}