Beviour of menu key in 1.3.38

Message ID 43C3F8E8.9070900@cadsoft.de
State New
Headers

Commit Message

Klaus Schmidinger Jan. 10, 2006, 6:11 p.m. UTC
Helmut Auer wrote:
> Hi
> 
>>> Why don't you use the BACK ( on most remote controls EXIT ) key for 
>>> that ?
>>>   
>>
>>
>> Because it goes back only one level.
>>
>>  
>>
> Ok - now I got you :-)
> So what about making it customizable:
> Option 1:
> - If OSD is used - clear it - if not open Menu
> Option 2:
> - like 1 + opening MainMenu

Ok, before this escalates into a religious war <g> please try this:


If this works for you (an others) I'll make this configurable.

Klaus
  

Comments

Wolfgang Rohdewald Jan. 10, 2006, 6:53 p.m. UTC | #1
On Dienstag 10 Januar 2006 19:11, Klaus Schmidinger wrote:
> If this works for you (an others) I'll make this configurable.

this works perfectly for me.
  
Carsten Presser Jan. 11, 2006, 5:51 p.m. UTC | #2
Klaus Schmidinger schrieb:
> If this works for you (an others) I'll make this configurable.
Works fine for me, I did not experience any problems.


Carsten.
  

Patch

--- vdr.c       2006/01/09 16:44:15     1.234
+++ vdr.c       2006/01/10 18:04:40
@@ -787,14 +787,16 @@ 
          // Keys that must work independent of any interactive mode:
          switch (key) {
            // Menu control:
-          case kMenu:
+          case kMenu: {
                 key = kNone; // nobody else needs to see this key
+               bool WasMenu = Interact && Interact->IsMenu();
                 if (Menu)
                    DELETE_MENU;
                 else if (cControl::Control() && cOsd::IsOpen())
                    cControl::Control()->Hide();
-               else
+               if (!WasMenu)
                    Menu = new cMenuMain;
+               }
                 break;
            // Info:
            case kInfo: {