2018-10-15 version 1.1.98 (horchi)\n - bugfix: Fixed init of dummy separator items for EPG menu\n\n1.1.98

2 files changed, 18 insertions, 3 deletions

diff --git a/HISTORY.h b/HISTORY.h
index 839aadc..590b99f 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.97"
-#define VERSION_DATE  "26.09.2018"
+#define _VERSION     "1.1.98"
+#define VERSION_DATE  "15.10.2018"
 
 #define DB_API       7
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2018-10-15 version 1.1.98 (horchi)
+   - bugfix: Fixed init of dummy separator items for EPG menu
+
 2018-09-26 version 1.1.97 (horchi)
    - change: Improved detection of recording end
 
diff --git a/menusched.c b/menusched.c
index 6884fd8..404e9fd 100644
--- a/menusched.c
+++ b/menusched.c
@@ -355,14 +355,24 @@ cMenuEpgScheduleSepItem::~cMenuEpgScheduleSepItem()
 
 bool cMenuEpgScheduleSepItem::Update(bool Force)
 {
+   if (tmpEvent)
+   {
+      delete tmpEvent;
+      tmpEvent = 0;
+   }
+
    if (channel)
    {
-      SetText(cString::sprintf("-----\t %s -----", channel ? channel->Name() : *event->GetDateString()));
+      tmpEvent = new cEvent(0);
+      tmpEvent->SetTitle(cString::sprintf("-----\t %s -----", channel->Name()));
+      tmpEvent->SetShortText(strncmp(channel->Name(), "->", 2) == 0 ? channel->Name()+2 : channel->Name()); // using short text to transport plain value to skin
+      SetText(tmpEvent->Title());
    }
    else if (event)
    {
       tmpEvent = new cEvent(0);
       tmpEvent->SetTitle(cString::sprintf("-----\t %s -----", *event->GetDateString()));
+      tmpEvent->SetShortText(event->GetDateString());  // using short text to transport plain value to skin
       SetText(tmpEvent->Title());
    }
 
@@ -371,6 +381,8 @@ bool cMenuEpgScheduleSepItem::Update(bool Force)
 
 void cMenuEpgScheduleSepItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
 {
+   tell(0, "calling SetMenuItem with '%s'", tmpEvent ? tmpEvent->Title() : "<null>");
+
    if (!DisplayMenu->SetItemEvent(tmpEvent, Index, Current, Selectable, channel, no, tmNone))
       DisplayMenu->SetItem(Text(), Index, Current, Selectable);
 }