From 3b656e9e46632e53b32714728e3ce3123995a916 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 26 Apr 2002 12:17:38 +0200
Subject: Now taking an active video cutting process into account when doing
 shutdown or housekeeping

---
 vdr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'vdr.c')

diff --git a/vdr.c b/vdr.c
index 874e8264..89aac3cb 100644
--- a/vdr.c
+++ b/vdr.c
@@ -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:
-- 
cgit v1.2.3