- fixed displaying of partial channel numbers while changing channels (thanks to

  Chris Warren)

3 files changed, 8 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 86ab45f..e763253 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -20,3 +20,7 @@ Reinhard Nissl
 
 Frank Enderle
   for sending a patch to fix a crash due to uninitialized pointer
+
+Chris Warren
+  for sending a patch to fix displaying partial channel numbers while changing
+	channels
diff --git a/HISTORY b/HISTORY
index e861639..75b7448 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7,6 +7,8 @@ VDR Plugin 'text2skin' Revision History
 - patch for PresentRemaining by Björn (VDR-Portal)
 - fixed a race condition (thanks to Reinhard Nissl for pointing this out)
 - updated finnish translations (thanks to Rolf Ahrenberg)
+- fixed displaying of partial channel numbers while changing channels (thanks to
+  Chris Warren)
 - added tokens for Recording Info Display
   (RecordingName, RecordingDateTime, RecordingTitle, RecordingShortText,
   RecordingDescription, RecordingLanguageCode, RecordingLanguageDescription)
diff --git a/display.c b/display.c
index a8fca2c..f150396 100644
--- a/display.c
+++ b/display.c
@@ -1,5 +1,5 @@
 /*
- * $Id: display.c,v 1.24 2005/09/20 18:22:56 lordjaxom Exp $
+ * $Id: display.c,v 1.25 2005/12/17 19:43:51 lordjaxom Exp $
  */
 
 #include "render.h"
@@ -116,9 +116,7 @@ cxType cText2SkinDisplayChannel::GetTokenData(const txToken &Token)
 {
 	switch (Token.Type) {
 	case tChannelNumber:
-		return mChannel != NULL
-		       ? (cxType)ChannelNumber(mChannel, mNumber)
-		       : (cxType)false;
+		return ChannelNumber(mChannel, mNumber)
 		
 	case tChannelName:
 		return mChannel != NULL