Version 1.1.18vdr-1.1.18

- Fixed missing initialization of 'number' in cChannel (thanks to Martin Hammerschmid
  for reporting this one).
- Fixed a misplaced ')' in the fix about the stale lock files (thanks again to
  Oliver Endriss for pointing this out - it was my fault).
- Group delimiters in the 'channels.conf' file that have no text (like a simple ":"
  or ":@201") no longer show up in the Channels menu (suggested by Guy Roussin).
- Added "Tele 5" to 'channels.conf' (thanks to Georg Hitsch).
- Changed the source directory name for plugins from 'SRC' to 'src' (suggested by
  Clemens Kirchgatterer).
- Removed transponders 10788, 11739 and 12266 from 'channels.conf' (apparently they
  are no longer active).
- Deactivated some templates in tools.h in case some plugin needs to use the STL
  (suggested by Gerald Berwolf).
- Timers now accept channel IDs even if the 'source' is 0 (thanks to Stefan Huelswitt
  for reporting this one).
- Now taking an active SVDRP connection into account when doing shutdown or
  housekeeping (suggested by Emil Naepflein).
- Macros in 'keymacros.conf' can now use "@plugin" to directly access the main menu
  function of a given plugin (see man vdr(5) for details).
- The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
  using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).

1 files changed, 4 insertions, 3 deletions

diff --git a/channels.c b/channels.c
index 6afa7b9..1e3d9c7 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.9 2002/11/24 14:28:48 kls Exp $
+ * $Id: channels.c 1.11 2002/11/29 14:10:46 kls Exp $
  */
 
 #include "channels.h"
@@ -174,6 +174,7 @@ cChannel::cChannel(void)
   tid          = 0;
   sid          = 888;
   rid          = 0;
+  number       = 0;
   groupSep     = false;
   polarization = 'v';
   inversion    = INVERSION_AUTO;
@@ -385,7 +386,7 @@ bool cChannels::Load(const char *FileName, bool AllowComments)
 int cChannels::GetNextGroup(int Idx)
 {
   cChannel *channel = Get(++Idx);
-  while (channel && !channel->GroupSep())
+  while (channel && !(channel->GroupSep() && *channel->Name()))
         channel = Get(++Idx);
   return channel ? Idx : -1;
 }
@@ -393,7 +394,7 @@ int cChannels::GetNextGroup(int Idx)
 int cChannels::GetPrevGroup(int Idx)
 {
   cChannel *channel = Get(--Idx);
-  while (channel && !channel->GroupSep())
+  while (channel && !(channel->GroupSep() && *channel->Name()))
         channel = Get(--Idx);
   return channel ? Idx : -1;
 }