From 96df157057827185f94a150bf3c8a049f8bca369 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 16 Feb 2003 10:34:24 +0100
Subject: [PATCH] Fixed broken support for raw OSDs of plugins

---
 CONTRIBUTORS | 1 +
 HISTORY      | 4 +++-
 vdr.c        | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c10172fa..fe70f1af 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -543,3 +543,4 @@ Jan Ekholm <chakie@infa.abo.fi>
 
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
+ for reporting broken support for raw OSDs of plugins
diff --git a/HISTORY b/HISTORY
index f9b14bf2..61b3a98e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1957,7 +1957,7 @@ Video Disk Recorder Revision History
 - Timers are now processed even if an OSD menu is open (except for menus that
   explicitly handle timers).
 
-2003-02-15: Version 1.1.25
+2003-02-16: Version 1.1.25
 
 - Fixed high CPU load during replay (thanks Marcel Wiesweg for pointing out this
   one).
@@ -1967,3 +1967,5 @@ Video Disk Recorder Revision History
 - Resetting the CAM slot in case communication breaks down.
 - Improved keyboard detection (thanks to Werner Fink).
 - Updated 'channels.conf.terr' (thanks to Andy Carter).
+- Fixed broken support for raw OSDs of plugins (thanks to Marcel Wiesweg for
+  reporting this one).
diff --git a/vdr.c b/vdr.c
index 49371064..3e6a9ed3 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.144 2003/02/15 15:36:01 kls Exp $
+ * $Id: vdr.c 1.145 2003/02/16 10:34:24 kls Exp $
  */
 
 #include <getopt.h>
@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
               }
            }
         // CAM control:
-        if (!Interface->IsOpen())
+        if (!Menu && !Interface->IsOpen())
            Menu = CamControl();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();