glenn/tts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Felicity Tarnell 2014-03-06 16:21:40 +00:00
parent 4ba7155d78
commit 983328d964
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for RT/TTS T.83.4. # Generated by GNU Autoconf 2.69 for RT/TTS T.83.5.
# #
# Report bugs to <felicity@loreley.flyingparchment.org.uk>. # Report bugs to <felicity@loreley.flyingparchment.org.uk>.
# #
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='RT/TTS' PACKAGE_NAME='RT/TTS'
PACKAGE_TARNAME='rt-tts' PACKAGE_TARNAME='rt-tts'
PACKAGE_VERSION='T.83.4' PACKAGE_VERSION='T.83.5'
PACKAGE_STRING='RT/TTS T.83.4' PACKAGE_STRING='RT/TTS T.83.5'
PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk' PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk'
PACKAGE_URL='' PACKAGE_URL=''
@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures RT/TTS T.83.4 to adapt to many kinds of systems. \`configure' configures RT/TTS T.83.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1293,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of RT/TTS T.83.4:";; short | recursive ) echo "Configuration of RT/TTS T.83.5:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1380,7 +1380,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
RT/TTS configure T.83.4 RT/TTS configure T.83.5
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -1749,7 +1749,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by RT/TTS $as_me T.83.4, which was It was created by RT/TTS $as_me T.83.5, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -4766,7 +4766,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by RT/TTS $as_me T.83.4, which was This file was extended by RT/TTS $as_me T.83.5, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -4828,7 +4828,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
RT/TTS config.status T.83.4 RT/TTS config.status T.83.5
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View file

@ -1,5 +1,5 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([RT/TTS], [T.83.4], [felicity@loreley.flyingparchment.org.uk]) AC_INIT([RT/TTS], [T.83.5], [felicity@loreley.flyingparchment.org.uk])
AC_CONFIG_SRCDIR([tts.c]) AC_CONFIG_SRCDIR([tts.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

6
tts.c
View file

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