summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-03-25 11:53:25 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-03-25 11:53:25 +0100
commita3405ded17e747ad613d4d930711bd34c1a45d5a (patch)
tree3f9a3c0c614b285c167dcbf5286ecabb38cac77d
parent3dd002cc2bc465cd10abef04e8b7d833105d48f2 (diff)
downloadvdr-a3405ded17e747ad613d4d930711bd34c1a45d5a.tar.gz
vdr-a3405ded17e747ad613d4d930711bd34c1a45d5a.tar.bz2
Fixed calling a plugin's main menu function while a message is being displayed
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--interface.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 80349ed2..093c4cff 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -558,6 +558,8 @@ Helmut Auer <vdr@helmutauer.de>
items at the beginning of the menu
for a patch that was used to implement stopping scanning the video directory if
there are too many levels of symbolic links
+ for reporting that an attempt to call a plugin's main menu function while a
+ message is being displayed didn't work
Jeremy Hall <jhall@UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c
diff --git a/HISTORY b/HISTORY
index 58837cf2..8bbeb66a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4438,3 +4438,5 @@ Video Disk Recorder Revision History
- Timer log messages now show "VPS" if this is a VPS timer.
- Fixed getting the present EPG event in case none is currently 'running' (it
then returns the one that just ended).
+- Fixed calling a plugin's main menu function while a message is being displayed
+ (reported by Helmut Auer).
diff --git a/interface.c b/interface.c
index 4b74db95..59147f4b 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.73 2006/01/29 12:35:50 kls Exp $
+ * $Id: interface.c 1.74 2006/03/25 11:50:55 kls Exp $
*/
#include "interface.h"
@@ -52,7 +52,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted)
break;
}
- if (KeepChar && ISRAWKEY(Key))
+ if (KeepChar && ISRAWKEY(Key) || Key == k_Plugin)
cRemote::Put(Key);
interrupted = false;
return Key;