Fixed starting a recording on the primary device if there is a replay session active

3 files changed, 9 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6561f6d5..ea52b1f8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -770,3 +770,7 @@ Richard Robson <richard_robson@beeb.net>
 Manfred Schmidt-Voigt <manfred.schmidt-voigt@mannitec.de>
  for reporting a problem with runnign out of disk space while cutting in case
  there are still deleted recordings to remove
+
+Javier Marcet <lists@marcet.info>
+ for reporting a problem when starting a recording on the primary device if there
+ is a replay session active
diff --git a/HISTORY b/HISTORY
index 25c0df24..e38c2cf1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2325,3 +2325,5 @@ Video Disk Recorder Revision History
   Keil).
 - VDR now continues to start up, even if there is an error in setup.conf.
 - Fixed a bug in resetting OSD color palettes (thanks to Torsten Herz).
+- Fixed starting a recording on the primary device if there is a replay session
+  active (thanks to Javier Marcet for reporting this one).
diff --git a/menu.c b/menu.c
index e3b32072..9cfd7c8f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.268 2003/08/17 08:52:07 kls Exp $
+ * $Id: menu.c 1.269 2003/08/24 14:28:44 kls Exp $
  */
 
 #include "menu.h"
@@ -25,6 +25,7 @@
 #include "sources.h"
 #include "status.h"
 #include "timers.h"
+#include "transfer.h"
 #include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
@@ -3102,7 +3103,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
      if (device) {
         if (NeedsDetachReceivers) {
            Stop(device);
-           if (device == cDevice::ActualDevice())
+           if (device == cTransferControl::ReceiverDevice())
               cControl::Shutdown(); // in case this device was used for Transfer Mode
            }
         if (!device->SwitchChannel(channel, false)) {