diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1a29cda7..d689e82d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -612,3 +612,7 @@ Benjamin Harling Christian Jacobsen for making the LIRC interface skip keys that come in too fast + +Andreas Mair + for reporting a short display of the main menu if a plugin displays its own OSD and + is started through a user defined key macro diff --git a/HISTORY b/HISTORY index acadbb5b..7d8f8031 100644 --- a/HISTORY +++ b/HISTORY @@ -2077,3 +2077,6 @@ Video Disk Recorder Revision History - Added a note regarding non-VDR files in the /videoX directories to INSTALL (suggested by Benjamin Harling). - Skipping keys that come in too fast from LIRC (thanks to Christian Jacobsen). +- Avoiding short display of the main menu if a plugin displays its own OSD and + is started through a user defined key macro (thanks to Andreas Mair for reporting + this one). diff --git a/interface.c b/interface.c index 9245c85f..6431f911 100644 --- a/interface.c +++ b/interface.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: interface.c 1.63 2003/04/12 14:17:49 kls Exp $ + * $Id: interface.c 1.64 2003/04/27 12:08:52 kls Exp $ */ #include "interface.h" @@ -56,7 +56,8 @@ void cInterface::Close(void) eKeys cInterface::GetKey(bool Wait) { - Flush(); + if (!cRemote::HasKeys()) + Flush(); if (SVDRP) { if (SVDRP->Process()) Wait = false; diff --git a/remote.h b/remote.h index f26be169..9ff95662 100644 --- a/remote.h +++ b/remote.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remote.h 1.25 2003/04/12 14:14:49 kls Exp $ + * $Id: remote.h 1.26 2003/04/27 12:05:48 kls Exp $ */ #ifndef __REMOTE_H @@ -45,6 +45,7 @@ public: static bool Put(eKeys Key); static bool PutMacro(eKeys Key); static const char *GetPlugin(void) { return plugin; } + static bool HasKeys(void) { return in != out; } static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL); };