summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlordjaxom <lordjaxom>2005-06-05 21:39:02 +0000
committerlordjaxom <lordjaxom>2005-06-05 21:39:02 +0000
commit136f061aaf2528cab7117bc1f5459a7930ccc1c8 (patch)
tree3fff708c3802927f3b2d5adfca64be1648d5a815
parent8912c967697854c1d651b4bc37ed6898737cfbd4 (diff)
downloadvdr-plugin-text2skin-136f061aaf2528cab7117bc1f5459a7930ccc1c8.tar.gz
vdr-plugin-text2skin-136f061aaf2528cab7117bc1f5459a7930ccc1c8.tar.bz2
- patch for PresentRemaining by Björn (VDR-Portal)
-rw-r--r--display.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/display.c b/display.c
index a21bc90..433d537 100644
--- a/display.c
+++ b/display.c
@@ -1,5 +1,5 @@
/*
- * $Id: display.c,v 1.22 2005/05/30 13:03:13 lordjaxom Exp $
+ * $Id: display.c,v 1.23 2005/06/05 21:39:02 lordjaxom Exp $
*/
#include "render.h"
@@ -184,10 +184,12 @@ cxType cText2SkinDisplayChannel::GetTokenData(const txToken &Token)
: (cxType)false;
case tPresentRemaining:
- return mPresent != NULL
- ? (cxType)DurationType((mPresent->Duration() - (time(NULL) - mPresent->StartTime()))
- * FRAMESPERSEC, Token.Attrib.Text)
- : (cxType)false;
+ if (mPresent != NULL && time(NULL) - mPresent->StartTime()
+ <= mPresent->Duration()) {
+ return (cxType)DurationType((mPresent->Duration() - (time(NULL) - mPresent->StartTime()))
+ * FRAMESPERSEC, Token.Attrib.Text);
+ }
+ return false;
case tPresentTitle:
return mPresent != NULL