frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Local timers are now preferred over remote timers in the Schedules menu

Browse Source
This commit is contained in:
Klaus Schmidinger 2017-11-09 12:22:20 +01:00
parent 33bbff2aa5
commit bc3b6ed601
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY
View File

@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History
a subdirectory. a subdirectory.
- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details). - SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
2017-11-08: Version 2.3.9 2017-11-09: Version 2.3.9
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@ -9191,3 +9191,6 @@ Video Disk Recorder Revision History
- OSD menus now try to keep the offset of the list cursor at a constant position on - OSD menus now try to keep the offset of the list cursor at a constant position on
the screen, even if the list is modified while being displayed. the screen, even if the list is modified while being displayed.
- The LCARS skin's main menu now reacts to changes of the current channel's name. - The LCARS skin's main menu now reacts to changes of the current channel's name.
- If an event in the Schedules menu is marked with a 'T' or 'I' and the user presses the
Red button to edit the timer, local timers are now preferred over remote timers
in case there is more than one timer that will record that event.

6
timers.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: timers.c 4.12 2017/10/31 09:41:31 kls Exp $ * $Id: timers.c 4.13 2017/11/09 12:10:46 kls Exp $
*/ */
#include "timers.h" #include "timers.h"
@ -792,10 +792,10 @@ const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const
eTimerMatch m = tmNone; eTimerMatch m = tmNone;
for (const cTimer *ti = First(); ti; ti = Next(ti)) { for (const cTimer *ti = First(); ti; ti = Next(ti)) {
eTimerMatch tm = ti->Matches(Event); eTimerMatch tm = ti->Matches(Event);
if (tm > m) { if (tm > m || tm == tmFull && ti->Local()) {
t = ti; t = ti;
m = tm; m = tm;
if (m == tmFull) if (m == tmFull && ti->Local())
break; break;
} }
} }