Avoiding shutdown message "Recording in ... minutes, shut down anyway?" with a negative number of minutes

CONTRIBUTORS

@@ -1457,6 +1457,8 @@ Udo Richter <udo_richter@gmx.de>
  plugins
  for reporting a missing '--vfat' in the vdr.1 man page
  for fixing deleting the last character of a string menu item in insert mode
+ for reporting that the shutdown message "Recording in ... minutes, shut down anyway?"
+ may have been given with a negative number of minutes
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date

HISTORY

@@ -4854,3 +4854,5 @@ Video Disk Recorder Revision History
   event timeout" setup parameter), and the user insists in shutting down now, the
   reboot time given to the shutdown script will correspond to a time that is
   "Min. event timeout" minutes (default is 30) in the future.
+- Avoiding shutdown message "Recording in ... minutes, shut down anyway?" with
+  a negative number of minutes (reported by Udo Richter).

vdr.c

@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.277 2006/08/05 10:40:57 kls Exp $
+ * $Id: vdr.c 1.278 2006/08/05 10:46:38 kls Exp $
  */
 
 #include <getopt.h>
@@ -1015,6 +1015,7 @@ int main(int argc, char *argv[])
                   }
                if (cPluginManager::Active(tr("shut down anyway?")))
                   break;
+               if (!cRecordControls::Active()) {
                   cTimer *timer = Timers.GetNextActiveTimer();
                   time_t Next  = timer ? timer->StartTime() : 0;
                   time_t Delta = timer ? Next - time(NULL) : 0;
@@ -1026,6 +1027,7 @@ int main(int argc, char *argv[])
                      if (!confirm)
                         break;
                      }
+                  }
                ForceShutdown = true;
                break;
                }