PliExtraInfo: Avoid possible GSOD with ServiceInfo
authorlittlesat <littlesat99@yahoo.com>
Sun, 23 Aug 2015 18:30:16 +0000 (20:30 +0200)
committerlittlesat <littlesat99@yahoo.com>
Sun, 23 Aug 2015 18:30:16 +0000 (20:30 +0200)
lib/python/Components/Converter/PliExtraInfo.py

index 4e23e38..fbf9fdc 100644 (file)
@@ -279,17 +279,17 @@ class PliExtraInfo(Poll, Converter, object):
                                + addspace(self.createCryptoBar(info)) + self.current_source + "\n" \
                                + addspace(self.createCryptoSpecial(info)) + addspace(self.createVideoCodec(info)) + self.createResolution(info)
 
-               if self.type == "ServiceInfo":
-                       return addspace(self.createProviderName(info)) + addspace(self.createTunerSystem(fedata)) + addspace(self.createFrequency(feraw)) + addspace(self.createPolarization(fedata)) \
-                       + addspace(self.createSymbolRate(fedata, feraw)) + addspace(self.createFEC(fedata, feraw)) + addspace(self.createModulation(fedata)) + addspace(self.createOrbPos(feraw)) \
-                       + addspace(self.createVideoCodec(info)) + self.createResolution(info)
-
                if self.type == "PIDInfo":
                        return self.createPIDInfo(info)
 
                if not feraw:
                        return ""
 
+               if self.type == "ServiceInfo":
+                       return addspace(self.createProviderName(info)) + addspace(self.createTunerSystem(fedata)) + addspace(self.createFrequency(feraw)) + addspace(self.createPolarization(fedata)) \
+                       + addspace(self.createSymbolRate(fedata, feraw)) + addspace(self.createFEC(fedata, feraw)) + addspace(self.createModulation(fedata)) + addspace(self.createOrbPos(feraw)) \
+                       + addspace(self.createVideoCodec(info)) + self.createResolution(info)
+
                if self.type == "TransponderInfo":
                        return self.createTransponderInfo(fedata, feraw)