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

2 files changed, 7 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index f7d8a9a4..b6f87e4a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History
   a subdirectory.
 - 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 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
   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.
+- 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.
diff --git a/timers.c b/timers.c
index bc894cc0..6859eece 100644
--- a/timers.c
+++ b/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 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"
@@ -792,10 +792,10 @@ const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const
   eTimerMatch m = tmNone;
   for (const cTimer *ti = First(); ti; ti = Next(ti)) {
       eTimerMatch tm = ti->Matches(Event);
-      if (tm > m) {
+      if (tm > m || tm == tmFull && ti->Local()) {
          t = ti;
          m = tm;
-         if (m == tmFull)
+         if (m == tmFull && ti->Local())
             break;
          }
       }