From f9aace9ae188a9e3eec61400f2f0ea996f10aff5 Mon Sep 17 00:00:00 2001
From: Midas <vdrportal_midas@gmx.de>
Date: Thu, 3 Jun 2010 17:18:41 +0200
Subject: The new detection method 'Channel EPG' sometimes switched into the
 wrong direction. Hopefully fixed now. Thanks to igel for testing and
 reporting.

---
 block.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/block.c b/block.c
index 1734bdd..29201f8 100644
--- a/block.c
+++ b/block.c
@@ -106,9 +106,10 @@ void cPluginBlock::MainThreadHook()
 {
   if (SetupBlock.DetectionMethod!=1) return;//other detection method active in setup
   channelnumber=cDevice::PrimaryDevice()->CurrentChannel();
-  if (mLastChannel==0)
+  if (channelnumber==0 || mLastChannel==0) //cond#1: switch in progress
   {
-    mLastChannel=channelnumber;
+    mLastChannel=cDevice::CurrentChannel();
+    return;
   }
 
   const cChannel *channel=Channels.GetByNumber(channelnumber);
-- 
cgit v1.2.3