summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--config.h10
-rw-r--r--menu.c4
4 files changed, 12 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7f7a2d37..4d629256 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -715,6 +715,7 @@ Oliver Endriss <o.endriss@gmx.de>
for suggesting to ignore channels with an RID that is not 0 when checking for obsolete
channels
for fixing a possible stack overflow in cListBase::Sort()
+ for reporting a crash when deleting a recording
Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 7e8fd5c6..4e08a288 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8827,3 +8827,7 @@ Video Disk Recorder Revision History
live tv (suggested by Dietmar Spingler).
- Empty adaptation field TS packets are now skipped when recording (thanks to
Christopher Reimer, based on the "AFFcleaner" by Stefan Pöschel).
+
+2015-09-16: Version 2.3.2
+
+- Fixed a crash when deleting a recording (reported by Oliver Endriss).
diff --git a/config.h b/config.h
index e5565da3..16630b3a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 4.5 2015/09/11 08:07:34 kls Exp $
+ * $Id: config.h 4.6 2015/09/16 11:11:42 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,13 +22,13 @@
// VDR's own version number:
-#define VDRVERSION "2.3.1"
-#define VDRVERSNUM 20301 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "2.3.2"
+#define VDRVERSNUM 20302 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "2.3.1"
-#define APIVERSNUM 20301 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "2.3.2"
+#define APIVERSNUM 20302 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/menu.c b/menu.c
index 569900ce..eebad8b2 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.12 2015/09/14 13:22:49 kls Exp $
+ * $Id: menu.c 4.13 2015/09/16 11:02:33 kls Exp $
*/
#include "menu.h"
@@ -3116,9 +3116,9 @@ eOSState cMenuRecordings::Delete(void)
cOsdMenu::Del(Current());
SetHelpKeys();
cVideoDiskUsage::ForceCheck();
- Display();
Recordings->SetModified();
recordingsStateKey.Remove();
+ Display();
if (!Count())
return osBack;
return osUser2;