aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-11-02 16:16:19 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-11-02 16:16:19 +0000
commit994845aaa96600b2834471fa5593b8e1419e2d3d (patch)
treec2fa9a7851b59477a41a988b54f62e8d907ef825 /lib/python
parent63c50e7cee4a774e5a6bd0b710dbf7c2bf24b8f3 (diff)
downloadenigma2-994845aaa96600b2834471fa5593b8e1419e2d3d.tar.gz
enigma2-994845aaa96600b2834471fa5593b8e1419e2d3d.zip
fix false positive "warning, skin is missing element epg_description in <class
'Screens.EventView.EventViewEPGSelect'>" debug output, fix endless loop
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/ScrollLabel.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/python/Components/ScrollLabel.py b/lib/python/Components/ScrollLabel.py
index c7e41c7c..d5924b88 100644
--- a/lib/python/Components/ScrollLabel.py
+++ b/lib/python/Components/ScrollLabel.py
@@ -14,7 +14,10 @@ class ScrollLabel(HTMLComponent, GUIComponent):
self.total = None
def applySkin(self, desktop):
- skin.applyAllAttributes(self.long_text, desktop, self.skinAttributes)
+ ret = False
+ if self.skinAttributes is not None:
+ skin.applyAllAttributes(self.long_text, desktop, self.skinAttributes)
+ ret = True
s = self.long_text.size()
self.instance.move(self.long_text.position())
lineheight=fontRenderClass.getInstance().getLineHeight( self.long_text.getFont() )
@@ -29,10 +32,11 @@ class ScrollLabel(HTMLComponent, GUIComponent):
self.long_text.move(ePoint(0,0))
self.long_text.resize(eSize(s.width()-30, self.pageHeight*16))
self.setText(self.message)
+ return ret
def setText(self, text):
self.message = text
- if self.long_text is not None:
+ if self.long_text is not None and self.pageHeight:
self.long_text.move(ePoint(0,0))
self.long_text.setText(self.message)
text_height=self.long_text.calculateSize().height()