diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | vdr.c | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 874d98ee..a137cc43 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -125,6 +125,8 @@ Stefan Huelswitt <huels@iname.com> for reporting a possible endless loop in shifting recordings between DVB cards for making it no longer setting PIDs 0x1FFF, which apparently fixes problems with CAMs and AC3 sound only working the first time + for making the main loop take an active video cutting process into account when + doing shutdown or housekeeping Ulrich Röder <roeder@efr-net.de> for pointing out that there are channels that have a symbol rate higher than @@ -1218,3 +1218,8 @@ Video Disk Recorder Revision History AC3 sound only working the first time (thanks to Stefan Huelswitt). - Now encoding '.' at the end of a directory name in case of VFAT=1, since Windows can't handle these (thanks to Simon Dean for reporting this one). + +2002-04-26: Version 1.0.2 + +- Now taking an active video cutting process into account when doing shutdown or + housekeeping (thanks to Stefan Huelswitt). @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/people/kls/vdr * - * $Id: vdr.c 1.102 2002/03/29 10:09:20 kls Exp $ + * $Id: vdr.c 1.103 2002/04/26 12:15:30 kls Exp $ */ #include <getopt.h> @@ -469,7 +469,7 @@ int main(int argc, char *argv[]) Interface->Info(tr("Editing process finished")); } } - if (!*Interact && (!cRecordControls::Active() || ForceShutdown)) { + if (!*Interact && ((!cRecordControls::Active() && !cVideoCutter::Active()) || ForceShutdown)) { time_t Now = time(NULL); if (Now - LastActivity > ACTIVITYTIMEOUT) { // Shutdown: |