Fixed a possible invalid lock sequence in cMenuTimers::OnOff()

2 files changed, 6 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 040d080d..345f89b0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9519,3 +9519,4 @@ Video Disk Recorder Revision History
 - Fixed handling newline characters in ci.c's CopyString() (reported by Winfried Köhler).
 - Fixed checking the return value of the Open() call in cFileName::SetOffset() (reported
   by Winfried Köhler).
+- Fixed a possible invalid lock sequence in cMenuTimers::OnOff().
diff --git a/menu.c b/menu.c
index c0dceb38..e680efc3 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.83 2020/07/01 15:05:17 kls Exp $
+ * $Id: menu.c 4.84 2020/09/16 13:35:30 kls Exp $
  */
 
 #include "menu.h"
@@ -1326,8 +1326,10 @@ eOSState cMenuTimers::OnOff(void)
         if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("MODT %d %s", Timer->Id(), *Timer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
            RemoteTimerError(Timer);
         }
-     LOCK_SCHEDULES_READ;
-     Timer->SetEventFromSchedule(Schedules);
+     {
+       LOCK_SCHEDULES_READ;
+       Timer->SetEventFromSchedule(Schedules);
+     }
      RefreshCurrent();
      DisplayCurrent(true);
      if (Timer->FirstDay())