1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed broken support for raw OSDs of plugins

This commit is contained in:
Klaus Schmidinger 2003-02-16 10:34:24 +01:00
parent 9dcfb9a2b8
commit 96df157057
3 changed files with 6 additions and 3 deletions

View File

@ -543,3 +543,4 @@ Jan Ekholm <chakie@infa.abo.fi>
Marcel Wiesweg <marcel.wiesweg@gmx.de> Marcel Wiesweg <marcel.wiesweg@gmx.de>
for pointing out a problem with high CPU load during replay for pointing out a problem with high CPU load during replay
for reporting broken support for raw OSDs of plugins

View File

@ -1957,7 +1957,7 @@ Video Disk Recorder Revision History
- Timers are now processed even if an OSD menu is open (except for menus that - Timers are now processed even if an OSD menu is open (except for menus that
explicitly handle timers). 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 - Fixed high CPU load during replay (thanks Marcel Wiesweg for pointing out this
one). one).
@ -1967,3 +1967,5 @@ Video Disk Recorder Revision History
- Resetting the CAM slot in case communication breaks down. - Resetting the CAM slot in case communication breaks down.
- Improved keyboard detection (thanks to Werner Fink). - Improved keyboard detection (thanks to Werner Fink).
- Updated 'channels.conf.terr' (thanks to Andy Carter). - Updated 'channels.conf.terr' (thanks to Andy Carter).
- Fixed broken support for raw OSDs of plugins (thanks to Marcel Wiesweg for
reporting this one).

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/people/kls/vdr * 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> #include <getopt.h>
@ -469,7 +469,7 @@ int main(int argc, char *argv[])
} }
} }
// CAM control: // CAM control:
if (!Interface->IsOpen()) if (!Menu && !Interface->IsOpen())
Menu = CamControl(); Menu = CamControl();
// User Input: // User Input:
cOsdObject *Interact = Menu ? Menu : cControl::Control(); cOsdObject *Interact = Menu ? Menu : cControl::Control();