frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed the locking sequence when creating a new timer from the Schedules menu

Browse Source
This commit is contained in:
Klaus Schmidinger 2017-06-03 12:51:22 +02:00
parent 2c74a31afe
commit 25d28e7421
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -9099,3 +9099,4 @@ Video Disk Recorder Revision History
Derek Kelly). Derek Kelly).
- Fixed a possible crash in case the SVDRP connection to a peer VDR is terminated - Fixed a possible crash in case the SVDRP connection to a peer VDR is terminated
while getting remote timers. while getting remote timers.
- Fixed the locking sequence when creating a new timer from the Schedules menu.

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.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" #include "menu.h"
@ -1653,6 +1653,7 @@ eOSState cMenuWhatsOn::Record(void)
if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) { if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
{ {
LOCK_TIMERS_WRITE; LOCK_TIMERS_WRITE;
LOCK_CHANNELS_READ;
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
Timers->SetExplicitModify(); Timers->SetExplicitModify();
if (item->timerMatch == tmFull) { if (item->timerMatch == tmFull) {
@ -1950,6 +1951,7 @@ eOSState cMenuSchedule::Record(void)
if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) { if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
{ {
LOCK_TIMERS_WRITE; LOCK_TIMERS_WRITE;
LOCK_CHANNELS_READ;
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
Timers->SetExplicitModify(); Timers->SetExplicitModify();
if (item->timerMatch == tmFull) { if (item->timerMatch == tmFull) {