X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3f5acc5cef5475cef339c967f8ca7da54b1625e3..525b031d2b8401750293fde4e334dfc8a5193517:/lib/python/Components/Converter/ConditionalShowHide.py

diff --git a/lib/python/Components/Converter/ConditionalShowHide.py b/lib/python/Components/Converter/ConditionalShowHide.py
index d2e89ba4..4860e17f 100644
--- a/lib/python/Components/Converter/ConditionalShowHide.py
+++ b/lib/python/Components/Converter/ConditionalShowHide.py
@@ -3,14 +3,16 @@ from Converter import Converter
 
 class ConditionalShowHide(Converter, object):
 	def __init__(self, argstr):
-		Converter.__init__(self, type)
+		Converter.__init__(self, argstr)
 		args = argstr.split(',')
 		self.invert = "Invert" in args
 		self.blink = "Blink" in args
 		if self.blink:
 			self.blinktime = 500
 			self.timer = eTimer()
-			self.timer.timeout.get().append(self.blinkFunc)
+			self.timer.callback.append(self.blinkFunc)
+		else:
+			self.timer = None
 
 	def blinkFunc(self):
 		if self.blinking == True:
@@ -56,3 +58,7 @@ class ConditionalShowHide(Converter, object):
 				self.stopBlinking()
 		else:
 			downstream.visible = self.calcVisibility()
+
+	def destroy(self):
+		if self.timer:
+			self.timer.callback.remove(self.blinkFunc)