Fixed resetting CAMs

3 files changed, 7 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e9027031..99b06db8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2887,3 +2887,6 @@ Reinhard Mantey <geronimo013@gmx.de>
 Michael Schneider <vdrportal_midas@gmx.de>
  for reporting a problem with the EPG scan in case a transponder is not receivable in
  a setup with bonded devices
+
+Marco Skambraks <marco@ammec.de>
+ for fixing resetting CAMs
diff --git a/HISTORY b/HISTORY
index 6dc72e8e..cccdc5be 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History
 - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
   Schmirler).
 
-2012-05-20: Version 1.7.28
+2012-05-29: Version 1.7.28
 
 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
 - Fixed getting the maximum short channel name length in case there are no short names
@@ -7115,3 +7115,4 @@ Video Disk Recorder Revision History
 - If a recording has no info file, the 'title' of the recording's info is now set
   to the recording's name.
 - cVector::Clear() now reinitializes any previously used members.
+- Fixed resetting CAMs (thanks to Marco Skambraks).
diff --git a/ci.c b/ci.c
index 0135d07a..ebed3204 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 2.8 2012/02/29 10:24:41 kls Exp $
+ * $Id: ci.c 2.9 2012/05/29 11:13:40 kls Exp $
  */
 
 #include "ci.h"
@@ -1715,6 +1715,7 @@ bool cCamSlot::Reset(void)
      if (ciAdapter->Reset(slotIndex)) {
         resetTime = time(NULL);
         dbgprotocol("ok.\n");
+        lastModuleStatus = msReset;
         return true;
         }
      dbgprotocol("failed!\n");