From e19403cc5f7996348d23528fbe6a3bc113da5e7d Mon Sep 17 00:00:00 2001
From: Tobias Grimm <git@e-tobi.net>
Date: Sun, 7 Feb 2010 22:08:28 +0100
Subject: Dont' loop forever if GetTxtxInfo failes (e.g. when no signal is
 available)

---
 ttxtsubs.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/ttxtsubs.c b/ttxtsubs.c
index 39e858c..cab8a14 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -389,18 +389,11 @@ void cPluginTtxtsubs::Action(void)
                           //from a different satellite, so what really should be done is to
                           //check if the dish is positioned
              while(tries<=2) {
-               while((geterror=GetTtxtInfo(dev->ActualDevice()->CardIndex(), c, &info))) {
+               if (geterror=GetTtxtInfo(dev->ActualDevice()->CardIndex(), c, &info)) {
                  esyslog("ttxtsubs: Error: GetTtxtInfo failed!");
-                 cCondWait::SleepMs(1000);
-                 getchmutex.Lock();
-                 bool changed=(cn!=switchChannel);
-                 getchmutex.Unlock();
-                 if (changed) {
-                   esyslog("ttxtsubs: Channel changed while looking for teletext info");
-                   break;
-                 }  
-               }  
-               if (!geterror) {
+                 break;
+               }
+               else {
                  if(FindSubs(&info, &pid, &page, lang)) {
                    //dprint("CHANNELSWITCH, pid: %d page: %x\n", pid, page);
                    for(int i = 0; i < gNumLanguages; i++) {
@@ -421,7 +414,7 @@ void cPluginTtxtsubs::Action(void)
                    FreeTtxtInfoData(&info);
                    tries++;
                  }  
-               } else break; //if(!geterror)..
+               }
              } //while(tries<=2)  
           }
           lastc=cn;
-- 
cgit v1.2.3