From c7120275206511042ddca4f56239ae5e0cb83835 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 4 Feb 2006 13:03:03 +0100
Subject: Fixed handling the "Setup/OSD/Menu button closes" option when set to
 'yes' in case a replay is active

---
 vdr.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'vdr.c')

diff --git a/vdr.c b/vdr.c
index 3913f625..bf09c988 100644
--- a/vdr.c
+++ b/vdr.c
@@ -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;
                }
-- 
cgit v1.2.3