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

Fixed a possible discrepancy of the primary device number in the LSTD and PRIM commands

This commit is contained in:
Klaus Schmidinger 2018-03-24 09:58:03 +01:00
parent 1f16ada70c
commit 53aea17949
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2265,6 +2265,8 @@ Javier Fern
Jürgen Schneider <ivory7@gmx.de> Jürgen Schneider <ivory7@gmx.de>
for a patch that was used as a base to fix handling multi byte key sequences for a patch that was used as a base to fix handling multi byte key sequences
in cKbdRemote in cKbdRemote
for reporting a possible discrepancy of the primary device number in the LSTD and
PRIM commands
Christian Wieninger <cwieninger@gmx.de> Christian Wieninger <cwieninger@gmx.de>
for suggesting to add cMenuEditStrItem::InEditMode() for suggesting to add cMenuEditStrItem::InEditMode()

5
HISTORY
View File

@ -9317,7 +9317,7 @@ Video Disk Recorder Revision History
- Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting - Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting
the user. the user.
2018-03-23: Version 2.4.0 2018-03-24: Version 2.4.0
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Fixed processing SVDRP client responses in case the caller doesn't want the actual - Fixed processing SVDRP client responses in case the caller doesn't want the actual
@ -9326,3 +9326,6 @@ Video Disk Recorder Revision History
some error. some error.
- Fixed some warnings from g++ 7.2.0 regarding fixed buffer sizes in cMenuEditTimeItem::Set() - Fixed some warnings from g++ 7.2.0 regarding fixed buffer sizes in cMenuEditTimeItem::Set()
and cCountdown::Update() (reported by Jörg Wendel). and cCountdown::Update() (reported by Jörg Wendel).
- Fixed a possible discrepancy of the primary device number in the LSTD and PRIM
commands, by setting Setup.PrimaryDVB in cDevice::SetPrimaryDevice() (reported by
Jürgen Schneider).

3
device.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: device.c 4.26 2018/01/27 14:45:08 kls Exp $ * $Id: device.c 4.27 2018/03/24 09:49:14 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -195,6 +195,7 @@ bool cDevice::SetPrimaryDevice(int n)
primaryDevice->MakePrimaryDevice(true); primaryDevice->MakePrimaryDevice(true);
primaryDevice->SetVideoFormat(Setup.VideoFormat); primaryDevice->SetVideoFormat(Setup.VideoFormat);
primaryDevice->SetVolumeDevice(Setup.CurrentVolume); primaryDevice->SetVolumeDevice(Setup.CurrentVolume);
Setup.PrimaryDVB = n + 1;
return true; return true;
} }
esyslog("ERROR: invalid primary device number: %d", n + 1); esyslog("ERROR: invalid primary device number: %d", n + 1);