mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed cTimers::GetNextActiveTimer() so that it won't return an expired timer
This commit is contained in:
		@@ -941,6 +941,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
 | 
			
		||||
 for reporting a crash in the Schedule menu with events that have no title
 | 
			
		||||
 for a patch that was used to implement automatic cursor advance when entering text
 | 
			
		||||
 via the numeric keys
 | 
			
		||||
 for reporting a problem with expired timers when shutting down via the Power key
 | 
			
		||||
 | 
			
		||||
Ralf Klueber <ralf.klueber@vodafone.com>
 | 
			
		||||
 for reporting a bug in cutting a recording if there is only a single editing mark
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							@@ -4255,3 +4255,5 @@ Video Disk Recorder Revision History
 | 
			
		||||
  recent driver/firmware versions.
 | 
			
		||||
- The epg.data file is now written when VDR exits (suggested by Daniel Karsubka).
 | 
			
		||||
- There is now a log message when VDR writes the epg.data file.
 | 
			
		||||
- Fixed cTimers::GetNextActiveTimer() so that it won't return an expired timer
 | 
			
		||||
  (reported by Rolf Ahrenberg).
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								timers.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								timers.c
									
									
									
									
									
								
							@@ -4,7 +4,7 @@
 | 
			
		||||
 * See the main source file 'vdr.c' for copyright information and
 | 
			
		||||
 * how to reach the author.
 | 
			
		||||
 *
 | 
			
		||||
 * $Id: timers.c 1.44 2006/01/27 15:35:17 kls Exp $
 | 
			
		||||
 * $Id: timers.c 1.45 2006/01/28 15:09:05 kls Exp $
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "timers.h"
 | 
			
		||||
@@ -567,7 +567,7 @@ cTimer *cTimers::GetNextActiveTimer(void)
 | 
			
		||||
{
 | 
			
		||||
  cTimer *t0 = NULL;
 | 
			
		||||
  for (cTimer *ti = First(); ti; ti = Next(ti)) {
 | 
			
		||||
      if ((ti->HasFlags(tfActive)) && (!t0 || ti->Compare(*t0) < 0))
 | 
			
		||||
      if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
 | 
			
		||||
         t0 = ti;
 | 
			
		||||
      }
 | 
			
		||||
  return t0;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user