2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 95098012..f0b5bb31 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9099,3 +9099,4 @@ Video Disk Recorder Revision History
   Derek Kelly).
 - Fixed a possible crash in case the SVDRP connection to a peer VDR is terminated
   while getting remote timers.
+- Fixed the locking sequence when creating a new timer from the Schedules menu.
diff --git a/menu.c b/menu.c
index 5160a726..543d7a4c 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.30 2017/05/28 21:14:20 kls Exp $
+ * $Id: menu.c 4.31 2017/06/03 12:49:38 kls Exp $
  */
 
 #include "menu.h"
@@ -1653,6 +1653,7 @@ eOSState cMenuWhatsOn::Record(void)
   if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
      {
        LOCK_TIMERS_WRITE;
+       LOCK_CHANNELS_READ;
        LOCK_SCHEDULES_READ;
        Timers->SetExplicitModify();
        if (item->timerMatch == tmFull) {
@@ -1950,6 +1951,7 @@ eOSState cMenuSchedule::Record(void)
   if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
      {
        LOCK_TIMERS_WRITE;
+       LOCK_CHANNELS_READ;
        LOCK_SCHEDULES_READ;
        Timers->SetExplicitModify();
        if (item->timerMatch == tmFull) {