summaryrefslogtreecommitdiff
path: root/ci.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2015-02-02 14:04:10 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2015-02-02 14:04:10 +0100
commit659f67f04fa5586f530fe00457bfcbdce566fb31 (patch)
tree00b2dc19037e900513cf5934f42d9d714c347099 /ci.c
parente2d0f3f8453750ce0de8a02289fe58161c2c505e (diff)
downloadvdr-659f67f04fa5586f530fe00457bfcbdce566fb31.tar.gz
vdr-659f67f04fa5586f530fe00457bfcbdce566fb31.tar.bz2
Fixed cCamSlot::Assign(), so that it actually ignores the value of Query if Device is NULL (as described in the header file)
Diffstat (limited to 'ci.c')
-rw-r--r--ci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci.c b/ci.c
index b1958bdc..b4a2d008 100644
--- a/ci.c
+++ b/ci.c
@@ -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)) {