From 64d0ed856b6c318aa161661f77b476c15dba6592 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 30 Mar 2003 10:53:22 +0200
Subject: Fixed faulty behaviour of the 'Mute' key in case the channel display
 is visible

---
 CONTRIBUTORS | 8 ++++++++
 HISTORY      | 3 +++
 vdr.c        | 7 +++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5a8fddd9..03c495bd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -556,3 +556,11 @@ Torsten Herz <torsten.herz@web.de>
 
 Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
  for reporting a problem with CPU load peaks (in the EPG scanner)
+
+Florian Bartels <Florian.Bartels@envisage.de>
+ for reporting a faulty behaviour of the "Mute" key in case the channel display
+ is visible
+
+Sascha Volkenandt <sascha@akv-soft.de>
+ for helping to fix a faulty behaviour of the "Mute" key in case the channel display
+ is visible
diff --git a/HISTORY b/HISTORY
index 468c1aad..bd52f997 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1999,3 +1999,6 @@ Video Disk Recorder Revision History
 - Made the log message "OSD window width must be a multiple of 4..." a debug message
   instead of an error message, so it can be avoided by using a log level less than 3.
 - Updated Greek language texts (thanks to Dimitrios Dimitrakos).
+- Fixed faulty behaviour of the "Mute" key in case the channel display is visible
+  (thanks to Florian Bartels for reporting this one and Sascha Volkenandt for
+  helping to fix it).
diff --git a/vdr.c b/vdr.c
index 50b1a290..86becfe0 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.146 2003/03/09 14:07:46 kls Exp $
+ * $Id: vdr.c 1.147 2003/03/30 10:43:58 kls Exp $
  */
 
 #include <getopt.h>
@@ -530,14 +530,17 @@ int main(int argc, char *argv[])
           case kVolDn:
           case kMute:
                if (key == kMute) {
-                  if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu)
+                  if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu) {
+                     key = kNone; // nobody else needs to see these keys
                      break; // no need to display "mute off"
+                     }
                   }
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
                if (!Interface->IsOpen())
                   Menu = Temp = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
+               key = kNone; // nobody else needs to see these keys
                break;
           // Power off:
           case kPower: isyslog("Power button pressed");
-- 
cgit v1.2.3