frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed closing the progress display with the 'Back' key when in trick mode and Setup.ShowReplayMode is enabled (cont'd)

This commit is contained in:
Klaus Schmidinger 2001-10-28 10:21:01 +01:00
parent 8690654eaf
commit d64416b922
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -836,7 +836,7 @@ Video Disk Recorder Revision History
- Completed storing the current audio volume in the setup.conf file (thanks - Completed storing the current audio volume in the setup.conf file (thanks
to Andy Grobb). to Andy Grobb).
- Fixed closing the progress display with the "Back" key when in trick mode - Fixed closing the progress display with the "Back" key when in trick mode
and Setup.ShowReplayMode is enabled. and Setup.ShowReplayMode is enabled (thanks to Stefan Huelswitt).
- New SVDRP commands LSTR and DELR to list and delete recordings (thanks to - New SVDRP commands LSTR and DELR to list and delete recordings (thanks to
Thomas Heiligenmann). Thomas Heiligenmann).
- Fixed a crash when pressing the '2' button while replaying a DVD. - Fixed a crash when pressing the '2' button while replaying a DVD.

15
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.134 2001/10/27 13:47:12 kls Exp $ * $Id: menu.c 1.135 2001/10/28 10:04:50 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2369,8 +2369,6 @@ cReplayControl::cReplayControl(void)
cReplayControl::~cReplayControl() cReplayControl::~cReplayControl()
{ {
Hide(); Hide();
if (Setup.ShowReplayMode)
Hide(); // the initial Hide() may have reopened the small mode display window
dvbApi->StopReplay(); dvbApi->StopReplay();
} }
@ -2424,10 +2422,7 @@ void cReplayControl::Hide(void)
if (visible) { if (visible) {
Interface->Close(); Interface->Close();
needsFastResponse = visible = false; needsFastResponse = visible = false;
if (!modeOnly) modeOnly = false;
ShowMode();
else
modeOnly = false;
} }
} }
@ -2680,6 +2675,7 @@ void cReplayControl::EditCut(void)
} }
else else
Interface->Error(tr("Editing process already active!")); Interface->Error(tr("Editing process already active!"));
ShowMode();
} }
} }
@ -2708,6 +2704,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
if (visible) { if (visible) {
if (timeoutShow && time(NULL) > timeoutShow) { if (timeoutShow && time(NULL) > timeoutShow) {
Hide(); Hide();
ShowMode();
timeoutShow = 0; timeoutShow = 0;
} }
else if (!modeOnly) else if (!modeOnly)
@ -2757,8 +2754,10 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
switch (Key) { switch (Key) {
// Menu control: // Menu control:
case kMenu: Hide(); return osMenu; // allow direct switching to menu case kMenu: Hide(); return osMenu; // allow direct switching to menu
case kOk: if (visible && !modeOnly) case kOk: if (visible && !modeOnly) {
Hide(); Hide();
DoShowMode = true;
}
else else
Show(); Show();
break; break;