diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | vdr.c | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 788c05b6..42c8a892 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1359,6 +1359,8 @@ Udo Richter <udo_richter@gmx.de> switching for reporting a problem with auto advance in string entry fields when pressing Up/Down in insert mode + for fixing handling the "Setup/OSD/Menu button closes" option when set to 'yes' in + case a replay is active Sven Kreiensen <svenk@kammer.uni-hannover.de> for his help in keeping 'channels.conf.terr' up to date @@ -4291,3 +4291,5 @@ Video Disk Recorder Revision History - Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski). - Fixed auto advance in string entry fields when pressing Up/Down in insert mode (reported by Udo Richter). +- Fixed handling the "Setup/OSD/Menu button closes" option when set to 'yes' in + case a replay is active (thanks to Udo Richter). @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.246 2006/01/29 14:35:31 kls Exp $ + * $Id: vdr.c 1.247 2006/02/04 12:57:03 kls Exp $ */ #include <getopt.h> @@ -796,8 +796,12 @@ int main(int argc, char *argv[]) bool WasMenu = Interact && Interact->IsMenu(); if (Menu) DELETE_MENU; - else if (cControl::Control() && cOsd::IsOpen()) - cControl::Control()->Hide(); + else if (cControl::Control()) { + if (cOsd::IsOpen()) + cControl::Control()->Hide(); + else + WasOpen = false; + } if (!WasOpen || !WasMenu && !Setup.MenuButtonCloses) Menu = new cMenuMain; } |