From a443d53e85de7e2f7e2ac56c5297d792ca103268 Mon Sep 17 00:00:00 2001 From: louis Date: Fri, 19 Dec 2014 15:05:26 +0100 Subject: [PATCH] fixed bug that wrong channel was shown in header of whatson if entering from whatsonnow --- HISTORY | 4 +++- views/displaymenuview.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index a9f7ac2..3966163 100644 --- a/HISTORY +++ b/HISTORY @@ -112,4 +112,6 @@ Version 0.1.0 - fixed display of color buttons in detailed views - fixed possible Nullpointer access in displaymenurootview -- added currentschedule viewelement in displaymenumain \ No newline at end of file +- added currentschedule viewelement in displaymenumain +- fixed bug that wrong channel was shown in header of whatson + if entering from whatsonnow \ No newline at end of file diff --git a/views/displaymenuview.h b/views/displaymenuview.h index 665ed7f..dbed6b6 100644 --- a/views/displaymenuview.h +++ b/views/displaymenuview.h @@ -52,7 +52,7 @@ private: public: cDisplayMenuSchedulesView(cTemplateView *tmplView, eMenuCategory menuCat, bool menuInit); virtual ~cDisplayMenuSchedulesView(); - void SetChannel(const cChannel *channel) { if (!this->channel) this->channel = channel; }; + void SetChannel(const cChannel *channel) { if (channel) this->channel = channel; }; const cChannel *GetChannel(void) { return channel; }; bool DrawHeader(void); };