1 files 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);