1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

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

This commit is contained in:
Klaus Schmidinger 2020-09-16 13:35:30 +02:00
parent 46b480c798
commit 76a7bed575
2 changed files with 6 additions and 3 deletions

View File

@ -9519,3 +9519,4 @@ Video Disk Recorder Revision History
- Fixed handling newline characters in ci.c's CopyString() (reported by Winfried Köhler). - 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 - Fixed checking the return value of the Open() call in cFileName::SetOffset() (reported
by Winfried Köhler). by Winfried Köhler).
- Fixed a possible invalid lock sequence in cMenuTimers::OnOff().

4
menu.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: 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" #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) if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("MODT %d %s", Timer->Id(), *Timer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
RemoteTimerError(Timer); RemoteTimerError(Timer);
} }
{
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
Timer->SetEventFromSchedule(Schedules); Timer->SetEventFromSchedule(Schedules);
}
RefreshCurrent(); RefreshCurrent();
DisplayCurrent(true); DisplayCurrent(true);
if (Timer->FirstDay()) if (Timer->FirstDay())