diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2006-02-04 13:03:03 +0100 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-02-04 13:03:03 +0100 |
commit | c7120275206511042ddca4f56239ae5e0cb83835 (patch) | |
tree | d826e35d4cbba5ea6bc3776cbed2172d2217e43a /vdr.c | |
parent | cbd32dd914d2670b907aa6030ecbeefab78ae8b3 (diff) | |
download | vdr-c7120275206511042ddca4f56239ae5e0cb83835.tar.gz vdr-c7120275206511042ddca4f56239ae5e0cb83835.tar.bz2 |
Fixed handling the "Setup/OSD/Menu button closes" option when set to 'yes' in case a replay is active
Diffstat (limited to 'vdr.c')
-rw-r--r-- | vdr.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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; } |