summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--vdr.c4
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b6b66349..f88a3d85 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -585,6 +585,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
for reporting broken support for raw OSDs of plugins
for reporting a problem with cReceivers that want to receive from PIDs that are
currently not transmitting
+ for fixing volume display in case a plugin has its own OSD open
Torsten Herz <torsten.herz@web.de>
for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
diff --git a/HISTORY b/HISTORY
index 49d936f8..610f9b75 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2186,3 +2186,5 @@ Video Disk Recorder Revision History
(thanks to Gerhard Steiner).
- Fixed cutting a recording if there is only a single editing mark (thanks to
Ralf Klueber for reporting this one).
+- Fixed volume display in case a plugin has its own OSD open (thanks to Marcel
+ Wiesweg).
diff --git a/vdr.c b/vdr.c
index 89e45c38..afb6d01e 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.156 2003/05/24 11:06:53 kls Exp $
+ * $Id: vdr.c 1.157 2003/05/24 12:11:43 kls Exp $
*/
#include <getopt.h>
@@ -564,7 +564,7 @@ int main(int argc, char *argv[])
}
else
cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
- if (!Interface->IsOpen())
+ if (!Menu && !Interface->IsOpen())
Menu = Temp = cDisplayVolume::Create();
cDisplayVolume::Process(key);
key = kNone; // nobody else needs to see these keys