From 876ea90a3145c64c6b6b1e9109b8b8c9e3e11ce8 Mon Sep 17 00:00:00 2001
From: mrwastl <mrwastl@users.sourceforge.net>
Date: Sun, 15 May 2011 00:06:21 +0200
Subject: move service-active checks to first successful fetching of service
 data

---
 service.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/service.c b/service.c
index bc6da24..af919f4 100644
--- a/service.c
+++ b/service.c
@@ -222,8 +222,8 @@ bool cGraphLCDService::NeedsUpdate(uint64_t CurrentTime)
         radioLastChange = CurrentTime;
         p = cPluginManager::CallFirstService("RadioTextService-v1.0", NULL);
         if (p) {
-            radioActive = true;
             if (cPluginManager::CallFirstService("RadioTextService-v1.0", &checkRTSData)) {
+                radioActive = true;
                 if (
                         (currRTSData.rds_info != checkRTSData.rds_info) ||
                         (currRTSData.rds_pty != checkRTSData.rds_pty) ||
@@ -251,8 +251,8 @@ bool cGraphLCDService::NeedsUpdate(uint64_t CurrentTime)
         lcrLastChange = CurrentTime;
         p = cPluginManager::CallFirstService("LcrService-v1.0", NULL);
         if (p) {
-            lcrActive = true;
             if (cPluginManager::CallFirstService("LcrService-v1.0", &checkLcrData)) {
+                lcrActive = true;
                 if (
                         (strcmp(currLcrData.destination, checkLcrData.destination) != 0) ||
                         (strcmp(currLcrData.price, checkLcrData.price) != 0) ||
@@ -321,8 +321,8 @@ bool cGraphLCDService::NeedsUpdate(uint64_t CurrentTime)
 #endif  /* GRAPHLCD_SERVICE_FEMON_VALID */
 
             if (femonVersionValid) {
-                femonActive = true;
                 if (cPluginManager::CallFirstService("FemonService-v1.0", &checkFemonData)) {
+                    femonActive = true;
                     if (
 #if 0
                             (strcmp(currFemonData.fe_name, checkFemonData.fe_name) != 0)  ||
-- 
cgit v1.2.3