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

Unified the internal sequence of actions when pressing the Blue and the Back key, respectively, during replay

This commit is contained in:
Klaus Schmidinger 2013-09-07 10:20:00 +02:00
parent e8fb500819
commit 699454ad7f
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -3174,3 +3174,7 @@ Seppo Ingalsuo <seppo.ingalsuo@iki.fi>
Manfred Völkel <mvoelkel@digitaldevices.de> Manfred Völkel <mvoelkel@digitaldevices.de>
for suggesting to make all bonded devices (except for the master) turn off their LNB for suggesting to make all bonded devices (except for the master) turn off their LNB
power completely to avoid problems when receiving vertically polarized transponders power completely to avoid problems when receiving vertically polarized transponders
Thomas Maass <mase@setho.org>
for reporting a difference in the internal sequence of actions when pressing the Blue
and the Back key, respectively, during replay

4
HISTORY
View File

@ -7920,7 +7920,7 @@ Video Disk Recorder Revision History
- Fixed cleaning up old EPG events in case no epg data file is given (reported by - Fixed cleaning up old EPG events in case no epg data file is given (reported by
Dave Pickles). Dave Pickles).
2013-09-06: Version 2.1.2 2013-09-07: Version 2.1.2
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed displaying DVB subtitles (thanks to Rolf Ahrenberg for helping to debug and - Fixed displaying DVB subtitles (thanks to Rolf Ahrenberg for helping to debug and
@ -7939,3 +7939,5 @@ Video Disk Recorder Revision History
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed cleaning up old EPG events in case no epg data file is given (reported by - Fixed cleaning up old EPG events in case no epg data file is given (reported by
Dave Pickles). Dave Pickles).
- Unified the internal sequence of actions when pressing the Blue and the Back key,
respectively, during replay (reported by Thomas Maass).

8
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 3.3 2013/08/21 10:45:11 kls Exp $ * $Id: menu.c 3.4 2013/09/07 10:03:16 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -4990,10 +4990,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
else else
Show(); Show();
break; break;
case kBack: if (Setup.DelTimeshiftRec) { case kBack: Hide();
cRecordControl* rc = cRecordControls::GetRecordControl(fileName); Stop();
return rc && rc->InstantId() ? osEnd : osRecordings;
}
return osRecordings; return osRecordings;
default: return osUnknown; default: return osUnknown;
} }