diff --git a/HISTORY b/HISTORY
index 260773a..ec246d0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -142,4 +142,5 @@ Version 0.1.2
- fixed two possible null pointer accesses in displaymenurootview
- fixed bug that EPGSearch Favorites Menu was not displayed correctly,
introduced "whatsonfavorites" Token in displaymenuschedules
-
+- fixed again display of channel in schedules header
+- added now and next in blackhole channels menu
diff --git a/displaymenu.c b/displaymenu.c
index 5a1a3e6..7759b61 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -100,13 +100,15 @@ bool cSDDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current,
rootView->SetEpgSearchFavorite();
}
const cChannel *channel = Channel;
- if (!channel) {
- channel = rootView->GetChannel();
- }
- if (!channel && Event) {
- channel = Channels.GetByChannelID(Event->ChannelID());
+ if (MenuCategory() == mcSchedule) {
+ if (!channel) {
+ channel = rootView->GetChannel();
+ }
+ if (!channel && Event) {
+ channel = Channels.GetByChannelID(Event->ChannelID());
+ }
+ rootView->SetChannel(channel);
}
- rootView->SetChannel(channel);
cDisplayMenuListView *list = rootView->GetListView();
if (!list)
diff --git a/skins/blackhole/themes/default/globals.xml b/skins/blackhole/themes/default/globals.xml
index adce91a..2d34794 100644
--- a/skins/blackhole/themes/default/globals.xml
+++ b/skins/blackhole/themes/default/globals.xml
@@ -40,6 +40,10 @@
Schedule
Programm
+
+ since
+ Seit
+
Reruns
Wiederholungen
diff --git a/skins/blackhole/xmlfiles/displaymenuchannels.xml b/skins/blackhole/xmlfiles/displaymenuchannels.xml
index eacde76..c1f8563 100644
--- a/skins/blackhole/xmlfiles/displaymenuchannels.xml
+++ b/skins/blackhole/xmlfiles/displaymenuchannels.xml
@@ -110,7 +110,9 @@
-
+
+
+
diff --git a/skins/blackhole/xmlfiles/displayreplay.xml b/skins/blackhole/xmlfiles/displayreplay.xml
index 1f5bcf5..b0ccb3d 100644
--- a/skins/blackhole/xmlfiles/displayreplay.xml
+++ b/skins/blackhole/xmlfiles/displayreplay.xml
@@ -81,7 +81,7 @@
{mediaheight} height of image in pixel
{isbanner} true if image is a banner, false if it is a poster
-->
-
+
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index 59910c1..2f3f11d 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -324,6 +324,10 @@ void cDisplayMenuRootView::KeyInput(bool up, bool page) {
}
void cDisplayMenuRootView::Clear(void) {
+ if (view) {
+ view->ClearChannel();
+ view->ClearEpgSearchFavorite();
+ }
if (listView) {
listView->Clear();
}
diff --git a/views/displaymenuview.h b/views/displaymenuview.h
index c66ae39..8463301 100644
--- a/views/displaymenuview.h
+++ b/views/displaymenuview.h
@@ -18,7 +18,9 @@ public:
void SetTitle(const char *title) {menuTitle = title; };
virtual void SetChannel(const cChannel *channel) {};
virtual const cChannel *GetChannel(void) { return NULL; };
+ virtual void ClearChannel(void) {};
virtual void SetEpgSearchFavorite(void) {};
+ virtual void ClearEpgSearchFavorite(void) {};
void SetButtonTexts(string *buttonTexts) { this->buttonTexts = buttonTexts; };
bool DrawBackground(void);
virtual bool DrawHeader(void);
@@ -59,7 +61,9 @@ public:
virtual ~cDisplayMenuSchedulesView();
void SetChannel(const cChannel *channel) { if (channel) this->channel = channel; };
const cChannel *GetChannel(void) { return channel; };
+ void ClearChannel(void) { channel = NULL; };
void SetEpgSearchFavorite(void) { isEpgSearchFavoritesMenu = true; };
+ void ClearEpgSearchFavorite(void) { isEpgSearchFavoritesMenu = false; };
bool DrawHeader(void);
};