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

Fixed cCamSlot::Assign(), so that it actually ignores the value of Query if Device is NULL (as described in the header file)

This commit is contained in:
Klaus Schmidinger 2015-02-02 14:04:10 +01:00
parent e2d0f3f845
commit 659f67f04f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -8471,3 +8471,5 @@ Video Disk Recorder Revision History
only halve the skip distance when the direction changes. That way you can reach the
desired point in a recording even if you make one too many skips in a certain
direction (see MANUAL for details).
- Fixed cCamSlot::Assign(), so that it actually ignores the value of Query if Device
is NULL (as described in the header file).

4
ci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: ci.c 3.18 2015/01/30 12:24:53 kls Exp $
* $Id: ci.c 3.19 2015/02/02 14:04:10 kls Exp $
*/
#include "ci.h"
@ -1776,7 +1776,7 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
if (ciAdapter->Assign(Device, true)) {
if (!Device && assignedDevice)
assignedDevice->SetCamSlot(NULL);
if (!Query) {
if (!Query || !Device) {
StopDecrypting();
source = transponder = 0;
if (ciAdapter->Assign(Device)) {