fixed bug that eventstart token was not cleared

This commit is contained in:
louis 2014-11-02 10:58:00 +01:00
parent 53c1eefa01
commit e258e9d9a6
2 changed files with 6 additions and 2 deletions

View File

@ -80,7 +80,7 @@
<area x="32%" y="2%" width="67%" height="96%" layer="2">
<fill color="{clrTransBlack}" />
</area>
<area x="32%" y="2%" width="67%" height="96%" layer="2">
<area condition="{flagactive}" x="32%" y="2%" width="67%" height="96%" layer="2">
<!-- title -->
<drawtext name="title" align="center" y="0" font="{vdrOsd}" width="{areawidth}-20" fontsize="8%" color="{clrWhite}" text="{eventtitle} - {eventshorttext}" />
<!-- start and stop if event is not running -->
@ -91,6 +91,10 @@
<drawtextbox condition="{hasposter}" x="10" y="{posy(poster)}" width="99%" height="{areaheight} - {posy(poster)}" float="topright" floatwidth="{width(poster)} + 10" floatheight="{height(poster)} + 20" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{eventdescription}" />
<drawtextbox condition="not{hasposter}" x="10" y="{posy(poster)}" width="99%" height="{areaheight} - {posy(poster)}" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{eventdescription}" />
</area>
<area condition="not{flagactive}" x="32%" y="2%" width="67%" height="96%" layer="2">
<drawtext x="10" y="0" font="{vdrOsd}" fontsize="8%" color="{clrWhite}" text="{channelname}" />
<drawtext x="10" y="10%" font="{vdrOsd}" fontsize="6%" color="{clrWhite}" text="{timerstart} - {timerstop}" />
</area>
</currentelement>
</menuitems>

View File

@ -457,7 +457,7 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
SetScraperPoster(event);
} else {
stringTokens.insert(pair<string,string>("eventtitle", ""));
stringTokens.insert(pair<string,string>("eventtitle", ""));
stringTokens.insert(pair<string,string>("eventstart", ""));
stringTokens.insert(pair<string,string>("eventstop", ""));
stringTokens.insert(pair<string,string>("eventshorttext", ""));
stringTokens.insert(pair<string,string>("eventdescription", ""));