Fixed calling a plugin's main menu function while a message is being displayed

This commit is contained in:
Klaus Schmidinger 2006-03-25 11:53:25 +01:00
parent 3dd002cc2b
commit a3405ded17
3 changed files with 6 additions and 2 deletions

View File

@ -558,6 +558,8 @@ Helmut Auer <vdr@helmutauer.de>
items at the beginning of the menu items at the beginning of the menu
for a patch that was used to implement stopping scanning the video directory if for a patch that was used to implement stopping scanning the video directory if
there are too many levels of symbolic links 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> Jeremy Hall <jhall@UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c for fixing an incomplete initialization of the filter parameters in eit.c

View File

@ -4438,3 +4438,5 @@ Video Disk Recorder Revision History
- Timer log messages now show "VPS" if this is a VPS timer. - 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 - Fixed getting the present EPG event in case none is currently 'running' (it
then returns the one that just ended). 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).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "interface.h"
@ -52,7 +52,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted) if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted)
break; break;
} }
if (KeepChar && ISRAWKEY(Key)) if (KeepChar && ISRAWKEY(Key) || Key == k_Plugin)
cRemote::Put(Key); cRemote::Put(Key);
interrupted = false; interrupted = false;
return Key; return Key;