Fixed updating the Schedule menu after editing a timer

2 files changed, 14 insertions, 8 deletions

diff --git a/HISTORY b/HISTORY
index 8dc5e5d1..372f5611 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9317,7 +9317,7 @@ Video Disk Recorder Revision History
 - Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting
   the user.
 
-2018-04-03: Version 2.4.0
+2018-04-05: Version 2.4.0
 
 - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
 - Fixed processing SVDRP client responses in case the caller doesn't want the actual
@@ -9337,3 +9337,4 @@ Video Disk Recorder Revision History
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Fixed sluggish setting of editing marks and a jumping progress display with very
   short recordings (reported by Oliver Endriss).
+- Fixed updating the Schedule menu after editing a timer.
diff --git a/menu.c b/menu.c
index aba69566..4805ff01 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.71 2018/04/02 13:41:39 kls Exp $
+ * $Id: menu.c 4.72 2018/04/05 14:18:18 kls Exp $
  */
 
 #include "menu.h"
@@ -1691,10 +1691,13 @@ eOSState cMenuWhatsOn::Record(void)
         Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
      if (HasSubMenu())
         CloseSubMenu();
-     if (Update())
-        Display();
-     SetHelpKeys(Channels);
      }
+  if (Update()) {
+     LOCK_SCHEDULES_READ;
+     Display();
+     }
+  LOCK_CHANNELS_READ;
+  SetHelpKeys(Channels);
   return osContinue;
 }
 
@@ -1999,10 +2002,12 @@ eOSState cMenuSchedule::Record(void)
         Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
      if (HasSubMenu())
         CloseSubMenu();
-     if (Update())
-        Display();
-     SetHelpKeys();
      }
+  if (Update()) {
+     LOCK_SCHEDULES_READ;
+     Display();
+     }
+  SetHelpKeys();
   return osContinue;
 }