diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2002-04-26 12:17:38 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2002-04-26 12:17:38 +0200 |
| commit | 3b656e9e46632e53b32714728e3ce3123995a916 (patch) | |
| tree | ef87e8ffd5e13d9317a414025a33fde9eb4e2ebe /vdr.c | |
| parent | 2e3030a963efe5f98062f25af03e87b79b25ea38 (diff) | |
| download | vdr-3b656e9e46632e53b32714728e3ce3123995a916.tar.gz vdr-3b656e9e46632e53b32714728e3ce3123995a916.tar.bz2 | |
Now taking an active video cutting process into account when doing shutdown or housekeeping
Diffstat (limited to 'vdr.c')
| -rw-r--r-- | vdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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: |