frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed a double channel switch when pressing the Channel+/- keys while no menu or channel display is open

Browse Source
This commit is contained in:
Klaus Schmidinger 2017-05-29 11:37:06 +02:00
parent 5324809a91
commit c9c15a727d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -9079,3 +9079,5 @@ Video Disk Recorder Revision History
Q=@ to the make call to have it less verbose (provided the plugin's Makefile Q=@ to the make call to have it less verbose (provided the plugin's Makefile
was modified as described above). was modified as described above).
- Added clearing CiResourceHandlers before shutting down the plugin manager. - Added clearing CiResourceHandlers before shutting down the plugin manager.
- Fixed a double channel switch when pressing the Channel+/- keys while no menu
or channel display is open.

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 4.15 2017/05/29 11:10:46 kls Exp $ * $Id: vdr.c 4.16 2017/05/29 11:30:27 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -1274,8 +1274,10 @@ int main(int argc, char *argv[])
case kChanUp: case kChanUp:
case kChanDn|k_Repeat: case kChanDn|k_Repeat:
case kChanDn: case kChanDn:
if (!Interact) if (!Interact) {
Menu = new cDisplayChannel(NORMALKEY(key)); Menu = new cDisplayChannel(NORMALKEY(key));
continue;
}
else if (cDisplayChannel::IsOpen() || cControl::Control()) { else if (cDisplayChannel::IsOpen() || cControl::Control()) {
Interact->ProcessKey(key); Interact->ProcessKey(key);
continue; continue;