From 56e5836b54ab1a7f5ad5b067e867a0c9392c5e5b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 28 Apr 2006 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.3.49=20-=20Fixed=20initializing=20'noapiv'?=
 =?UTF-8?q?=20in=20the=20Makefile=20(reported=20by=20Ronny=20Kornexl).=20-?=
 =?UTF-8?q?=20Fixed=20extracting=20APIVERSION=20to=20work=20with=20older?=
 =?UTF-8?q?=20versions=20of=20'sed'=20(reported=20by=20=20=20Oliver=20Endr?=
 =?UTF-8?q?iss;=20thanks=20also=20to=20Udo=20Richter=20for=20a=20shorter?=
 =?UTF-8?q?=20version=20of=20the=20'sed'=20=20=20expression).=20-=20Fixed?=
 =?UTF-8?q?=20broken=20APIVERSION=20extraction=20line=20in=20'newplugin'?=
 =?UTF-8?q?=20(thanks=20to=20Oliver=20Endriss).=20-=20Fixed=20entering=20'?=
 =?UTF-8?q?0'=20in=20a=20cMenuEditIntItem=20(reported=20by=20Mirko=20D?=
 =?UTF-8?q?=C3=B6lle).=20-=20Updated=20the=20Italian=20OSD=20texts=20(than?=
 =?UTF-8?q?ks=20to=20Nino=20Gerbino).=20-=20Added=20a=20note=20about=20add?=
 =?UTF-8?q?ing=20'INCLUDES=20+=3D=20-I$(DVBDIR)/include'=20to=20an=20exist?=
 =?UTF-8?q?ing=20=20=20Make.config=20(problem=20reported=20by=20Markus=20E?=
 =?UTF-8?q?hrnsperger).=20-=20Fixed=20handling=20the=20cPluginManager::Act?=
 =?UTF-8?q?ive()=20result=20when=20pressing=20the=20"Power"=20key=20=20=20?=
 =?UTF-8?q?(reported=20by=20Werner=20F=C3=A4rber).=20-=20Added=20a=20hint?=
 =?UTF-8?q?=20about=20commenting=20out=20the=20line=20'#define=20USE=5FFAD?=
 =?UTF-8?q?VISE'=20in=20tools.c=20in=20=20=20case=20of=20problems=20with?=
 =?UTF-8?q?=20replaying=20in=20fast=20forward=20mode=20if=20the=20video=20?=
 =?UTF-8?q?directory=20is=20=20=20mounted=20via=20a=20Samba=20share=20(rep?=
 =?UTF-8?q?orted=20by=20Andy=20Grobb).=20-=20Changed=20the=20"Really=20res?=
 =?UTF-8?q?tart=3F"=20prompt=20in=20the=20call=20to=20cPluginManager::Acti?=
 =?UTF-8?q?ve()=20in=20=20=20menu.c=20to=20"restart=20anyway=3F"=20(sugges?=
 =?UTF-8?q?ted=20by=20Rolf=20Ahrenberg).=20-=20Removed=20the=20obsolete=20?=
 =?UTF-8?q?"'1'=20for=20encrypted=20radio=20channels"=20part=20from=20the?=
 =?UTF-8?q?=20description=20=20=20of=20the=20VPID=20in=20vdr.5=20(reported?=
 =?UTF-8?q?=20by=20Alexander=20Hans).=20-=20Fixed=20tuning=20to=20the=20ch?=
 =?UTF-8?q?annel=20of=20a=20VPS=20timer=20if=20the=20device=20is=20the=20a?=
 =?UTF-8?q?ctual=20device.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vdr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'vdr.c')

diff --git a/vdr.c b/vdr.c
index ff87c03..7922386 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.264 2006/04/22 11:26:04 kls Exp $
+ * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
  */
 
 #include <getopt.h>
@@ -792,9 +792,9 @@ int main(int argc, char *argv[])
                         }
                      // Switch the device to the transponder:
                      if (Device) {
-                        if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
-                           cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                         if (!Device->IsTunedToTransponder(Timer->Channel())) {
+                           if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
+                              cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                            dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
                            Device->SwitchChannel(Timer->Channel(), false);
                            DeviceUsed[Device->DeviceNumber()] = Now;
@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
                           if (Interface->Confirm(tr("Recording - shut down anyway?")))
                              ForceShutdown = true;
                           }
-                       if (cPluginManager::Active(tr("shut down anyway?")))
+                       if (!cPluginManager::Active(tr("shut down anyway?")))
                           ForceShutdown = true;
                        LastActivity = 1; // not 0, see below!
                        UserShutdown = true;
-- 
cgit v1.2.3