Fixed showing the replay mode if the OSD is currently in use

This commit is contained in:
Klaus Schmidinger 2004-10-16 10:26:34 +02:00
parent ac13b6e161
commit 1a2ddff60d
3 changed files with 7 additions and 2 deletions

View File

@ -1073,3 +1073,6 @@ Mike parker <vdr@msatt.freeserve.co.uk>
Dick Streefland <Dick.Streefland@xs4all.nl>
for fixing a crash in case the last line in channels.conf is a group separator and
that group is selected in the channel display
Kimmo Tykkala <tykkala@iki.fi>
for pointing out a problem in showing the replay mode if the OSD is currently in use

View File

@ -3007,3 +3007,5 @@ Video Disk Recorder Revision History
to finding out that this was the basic problem causing buffer overflows).
- Improved Transfer Mode (thanks to Marco Schlüßler for suggestions and testing).
- Fixed a possible crash with inconsistent SI data (thanks to Marcel Wiesweg).
- Fixed showing the replay mode if the OSD is currently in use (thanks to Kimmo
Tykkala for pointing out this problem).

4
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 1.311 2004/08/08 14:29:14 kls Exp $
* $Id: menu.c 1.312 2004/10/16 10:24:11 kls Exp $
*/
#include "menu.h"
@ -3081,7 +3081,7 @@ void cReplayControl::Hide(void)
void cReplayControl::ShowMode(void)
{
if (visible || Setup.ShowReplayMode) {
if (visible || Setup.ShowReplayMode && !cOsd::IsOpen()) {
bool Play, Forward;
int Speed;
if (GetReplayMode(Play, Forward, Speed) && (!visible || Play != lastPlay || Forward != lastForward || Speed != lastSpeed)) {