summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-01-30 09:10:39 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2014-01-30 09:10:39 +0100
commit4c304467ba8e8ff7d36d4b5b06b3e26ddf6456a7 (patch)
treecdc11a2778b613b3baa60cd8f938d53394f372e1
parent6a9502ab1789ca438ebd598c004818303168e604 (diff)
downloadvdr-4c304467ba8e8ff7d36d4b5b06b3e26ddf6456a7.tar.gz
vdr-4c304467ba8e8ff7d36d4b5b06b3e26ddf6456a7.tar.bz2
Fixed clearing non-editable members in the channel editor
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--menu.c6
3 files changed, 8 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 865c7a32..4028f101 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1182,6 +1182,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
for suggesting to prompt the user for confirmation before overwriting an already
existing edited version of a recording
for adding code for parsing LCN and AVC descriptors to libsi
+ for fixing clearing non-editable members in the channel editor
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 872e729b..3426939b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8170,7 +8170,7 @@ Video Disk Recorder Revision History
- Fixed a superfluous call to the skin's SetRecording() function after renaming a
recording (reported by Christoph Haubrich).
-2014-01-29: Version 2.1.5
+2014-01-30: Version 2.1.5
- Now checking whether the primary device actually has a decoder before retuning the
current channel after a change in its parameters. This fixes broken recordings on
@@ -8181,3 +8181,4 @@ Video Disk Recorder Revision History
Oliver Endriss).
- Fixed sorting recordings by time in the Recordings menu if "Setup/OSD/Recording
directories" is set to "no".
+- Fixed clearing non-editable members in the channel editor (thanks to Rolf Ahrenberg).
diff --git a/menu.c b/menu.c
index cc5279bd..a300b0c9 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 3.17 2014/01/29 10:41:10 kls Exp $
+ * $Id: menu.c 3.18 2014/01/30 09:04:06 kls Exp $
*/
#include "menu.h"
@@ -181,9 +181,13 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
strn0cpy(name, data.name, sizeof(name));
if (New) {
channel = NULL;
+ // clear non-editable members:
data.nid = 0;
data.tid = 0;
data.rid = 0;
+ *data.shortName = 0;
+ *data.provider = 0;
+ *data.portalName = 0;
}
}
Setup();