2 files changed, 5 insertions, 4 deletions
diff --git a/coreengine/viewdisplaychannel.c b/coreengine/viewdisplaychannel.c
index 156c01b..0a9b8aa 100644
--- a/coreengine/viewdisplaychannel.c
+++ b/coreengine/viewdisplaychannel.c
@@ -261,9 +261,6 @@ void cViewChannel::SetEvents(const cEvent *present, const cEvent *following) {
     if (veProgressBar)
         veProgressBar->Set(present);
 
-    if (!present && !following)
-        return;
-    
     if (veEpgInfo)
         veEpgInfo->Set(present, following);
 
diff --git a/coreengine/viewelementsdisplaychannel.c b/coreengine/viewelementsdisplaychannel.c
index 95d040e..c931557 100644
--- a/coreengine/viewelementsdisplaychannel.c
+++ b/coreengine/viewelementsdisplaychannel.c
@@ -176,6 +176,8 @@ bool cVeDcEpgInfo::Parse(bool force) {
 }
 
 void cVeDcEpgInfo::Close(void) {
+    current = NULL;
+    next = NULL;
     tokenContainer->Clear();
     cViewElement::Close();
 }
@@ -228,6 +230,7 @@ void cVeDcProgressBar::Close(void) {
     currentLast = -1;
     startTime = -1;
     duration = -1;
+    tokenContainer->Clear();
     cViewElement::Close();
 }
 
@@ -617,7 +620,8 @@ void cVeDcScraperContent::SetTokenContainer(void) {
 
 void cVeDcScraperContent::Set(const cEvent *e) {
     tokenContainer->Clear();
-    SetPosterBanner(tokenContainer, e, NULL);
+    if (e)
+       SetPosterBanner(tokenContainer, e, NULL);
     SetDirty();
 }