summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-01-30 09:14:17 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2014-01-30 09:14:17 +0100
commit5b65ff5b37de31bdeea3e9fadeaee1a3616e5a5d (patch)
tree09c53dee3e4fa0cce5e825f40c382b87b3669401
parentc1ddb5240529ea8b3388808bce682248a07a2dd5 (diff)
downloadvdr-5b65ff5b37de31bdeea3e9fadeaee1a3616e5a5d.tar.gz
vdr-5b65ff5b37de31bdeea3e9fadeaee1a3616e5a5d.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 c7f5d0de..a8f3a8d4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1175,6 +1175,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel()
for a patch that was used to rename the "plp id" to a more general "stream id"
and add support for DVB-S2 "Input Stream Identifier" (ISI)
+ 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 78dd77c8..5c3f2f07 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7870,7 +7870,7 @@ Video Disk Recorder Revision History
and also to use the correct directory with --edit (the latter reported by Marko
Mäkelä).
-2014-01-29: Version 2.0.6
+2014-01-30: Version 2.0.6
- Updated 'sources.conf' (thanks to Antti Hartikainen).
- cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
@@ -7887,3 +7887,4 @@ Video Disk Recorder Revision History
Eike Sauer and 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 6935838e..7018741d 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 2.82.1.6 2014/01/29 10:48:02 kls Exp $
+ * $Id: menu.c 2.82.1.7 2014/01/30 09:11:46 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();