2 files changed, 5 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 5a932b1d..0f62427d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9186,3 +9186,5 @@ Video Disk Recorder Revision History
   'DEPRECATED_VDR_CHARSET_OVERRIDE=1' when compiling in order to restore this
   functionality. However, it is recommended to use the command line option --chartab
   instead.
+- The timeout for the channel display is now reset whenever the channel or EPG data
+  changes.
diff --git a/menu.c b/menu.c
index 105a7164..a12276df 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.42 2017/10/31 09:42:07 kls Exp $
+ * $Id: menu.c 4.43 2017/11/02 15:26:42 kls Exp $
  */
 
 #include "menu.h"
@@ -4563,6 +4563,7 @@ void cDisplayChannel::DisplayChannel(void)
   displayChannel->SetChannel(channel, number);
   cStatus::MsgOsdChannel(ChannelString(channel, number));
   lastPresent = lastFollowing = NULL;
+  lastTime.Set();
 }
 
 void cDisplayChannel::DisplayInfo(void)
@@ -4578,6 +4579,7 @@ void cDisplayChannel::DisplayInfo(void)
            cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
            lastPresent = Present;
            lastFollowing = Following;
+           lastTime.Set();
            }
         }
      }