frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed stopping a remote repeating timer

This commit is contained in:
Klaus Schmidinger 2018-03-03 12:55:57 +01:00
parent 7b77f400a1
commit b1b4a12848
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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.64 2018/02/25 13:54:57 kls Exp $ * $Id: menu.c 4.65 2018/03/03 12:55:57 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -3142,6 +3142,7 @@ static bool TimerStillRecording(const char *FileName)
if (Interface->Confirm(tr("Timer still recording - really delete?"))) { if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
LOCK_TIMERS_WRITE; LOCK_TIMERS_WRITE;
if (cTimer *Timer = Timers->GetById(Id, Remote)) { if (cTimer *Timer = Timers->GetById(Id, Remote)) {
cTimer OldTimer = *Timer;
Timer->Skip(); Timer->Skip();
if (Timer->IsSingleEvent()) { if (Timer->IsSingleEvent()) {
if (HandleRemoteModifications(NULL, Timer)) if (HandleRemoteModifications(NULL, Timer))
@ -3149,7 +3150,7 @@ static bool TimerStillRecording(const char *FileName)
else else
return true; // error while deleting remote timer return true; // error while deleting remote timer
} }
else if (!HandleRemoteModifications(Timer)) else if (!HandleRemoteModifications(Timer, &OldTimer))
return true; // error while modifying remote timer return true; // error while modifying remote timer
} }
} }