Fixed a bug if switching to a invalid channel

3 files changed, 3 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 0387e84..377051a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -217,4 +217,5 @@ Version 0.1.2
 - Additional information in channels menu configurable: choice between
   transponder information and current schedule
 - Added optional dedicated status icons in channel display
-- Added optional display of channel source information in channel display 
+- Added optional display of channel source information in channel display
+- Fixed a bug if switching to a invalid channel
diff --git a/displaychannel.c b/displaychannel.c
index f237e3b..0d8208a 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -526,7 +526,7 @@ void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
     }
     
     if (!groupSep) {
-        if (withInfo) {
+        if (withInfo && Channel) {
             if (config.symbolStyle == 0) {
                 DrawIconMask();
                 DrawIcons(Channel);
diff --git a/displaymenu.c b/displaymenu.c
index d62416e..6add8b8 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -747,7 +747,6 @@ void cNopacityDisplayMenu::Flush(void) {
     initMenu = false;
     initial = false;
     osd->Flush();
-    //esyslog("nopacity: scaling to x: %d, y: %d, width: %d, height: %d", videoWindowRect.X(), videoWindowRect.Y(), videoWindowRect.Width(), videoWindowRect.Height());
     cDevice::PrimaryDevice()->ScaleVideo(videoWindowRect);
 }