summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2018-09-23 10:21:12 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2018-09-23 10:21:12 +0200
commitbcee8ad43dc56ce905f911fba55b245fe93f5af9 (patch)
tree71e88af8f06e16b20f5e05cf519a662c36ff91a8
parent336822f6724dd3a2dbc4fbd5db357fc7b2a2ae39 (diff)
downloadvdr-bcee8ad43dc56ce905f911fba55b245fe93f5af9.tar.gz
vdr-bcee8ad43dc56ce905f911fba55b245fe93f5af9.tar.bz2
Now deactivating MTD support if a non MCD capable CAM is inserted after removing a previously used CAM that is MCD capable
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY4
-rw-r--r--ci.c3
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f20563c0..9cd65740 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3567,6 +3567,8 @@ Onur Sentürk <onur@sentek.org>
Helmut Binder <cco@aon.at>
for improving calculating signal strength and quality
for fixing switching through encrypted channels with the Up/Down keys
+ for deactivating MTD support if a non MCD capable CAM is inserted after removing
+ a previously used CAM that is MCD capable
Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is
diff --git a/HISTORY b/HISTORY
index 0e2a07f9..ec660ae5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History
Senzel).
- Official release.
-2018-07-16: Version 2.4.1
+2018-09-23: Version 2.4.1
- Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
by Johann Friedrichs).
@@ -9365,3 +9365,5 @@ Video Disk Recorder Revision History
(reported by Ulrich Eckhardt).
- Fixed switching through encrypted channels with the Up/Down keys (thanks to Helmut
Binder).
+- Now deactivating MTD support if a non MCD capable CAM is inserted after removing
+ a previously used CAM that is MCD capable (thanks to Helmut Binder).
diff --git a/ci.c b/ci.c
index 07e0c892..3edfe12b 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 4.21 2018/03/19 16:37:03 kls Exp $
+ * $Id: ci.c 4.22 2018/09/23 10:17:20 kls Exp $
*/
#include "ci.h"
@@ -1213,6 +1213,7 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
}
else {
dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", CamSlot()->SlotNumber());
+ CamSlot()->MtdActivate(false);
state = 4; // normal operation
}
}