summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2020-11-06 13:13:05 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2020-11-06 13:13:05 +0100
commitc23547c4ca729ba35139092e4c86a8f0f6454bfc (patch)
tree72d4efebe821eae07b66c8a0751d8ca041b07bc3
parent0468b38ff3754bb195688fb2ec6314835e028125 (diff)
downloadvdr-c23547c4ca729ba35139092e4c86a8f0f6454bfc.tar.gz
vdr-c23547c4ca729ba35139092e4c86a8f0f6454bfc.tar.bz2
Fixed a crash in case an error occurs when setting a remote timer
-rw-r--r--HISTORY3
-rw-r--r--menu.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index f41fc285..6cfbcb53 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9536,9 +9536,10 @@ Video Disk Recorder Revision History
cDvbTuner::GetSignalStats() to avoid problems with drivers that don't do this
(thanks to Helmut Binder).
-2020-11-03:
+2020-11-06:
- Fixed multiple recording entries in case a recording is started during the initial
reading of the video directory (reported by Claus Muus).
- Fixed an unnecessary double call to Display() in cMenuRecording::RefreshRecording()
(reported by Christoph Haubrich).
+- Fixed a crash in case an error occurs when setting a remote timer.
diff --git a/menu.c b/menu.c
index 071d9292..1a295dc7 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.86 2020/11/03 22:12:38 kls Exp $
+ * $Id: menu.c 4.87 2020/11/06 13:13:05 kls Exp $
*/
#include "menu.h"
@@ -1130,7 +1130,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
addedTimer = timer;
if (!HandleRemoteModifications(timer)) {
// must add the timer before HandleRemoteModifications to get proper log messages with timer ids
- Timers->Del(timer);
+ Timers->Del(timer, false);
addedTimer = NULL;
return osContinue;
}