diff mbox

1.3.39, "Menu button closes" true: No menu from replay

Message ID 43CA88C0.9040304@gmx.de
State New
Headers

Commit Message

Udo Richter Jan. 15, 2006, 5:39 p.m. UTC 
  Hi Klaus,

With 1.3.39 and "Menu button closes" set to true, the main menu doesn't
open if any replay control is active. The attached patch fixes this by
resetting a !IsOpen cControl to WasOpen=false.

Cheers,

Udo

Comments

Udo Richter Jan. 22, 2006, 6:05 p.m. UTC | #1 
Udo Richter wrote:
> With 1.3.39 and "Menu button closes" set to true, the main menu doesn't
> open if any replay control is active. The attached patch fixes this by
> resetting a !IsOpen cControl to WasOpen=false.

This slipped the 1.3.40 release somehow, but the attached patch still works.

Cheers,

Udo
Joachim Wilke Jan. 29, 2006, 6:25 p.m. UTC | #2 
2006/1/22, Udo Richter <udo_richter@gmx.de>:
> > With 1.3.39 and "Menu button closes" set to true, the main menu doesn't
> > open if any replay control is active. The attached patch fixes this by
> > resetting a !IsOpen cControl to WasOpen=false.
>
> This slipped the 1.3.40 release somehow, but the attached patch still works.

Just a remark: It seems, that in 1.3.41 this is still not fixed.

Joachim.
diff mbox

Patch

--- vdr-1.3.39-old/vdr.c	2006-01-15 18:33:54.000000000 +0100
+++ vdr-1.3.39/vdr.c	2006-01-15 18:38:28.000000000 +0100
@@ -795,8 +795,12 @@ 
                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;
                }