X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FHotplug%2Fplugin.py;h=21b214a54589d9e3cff31f899d7cd2933ca41c6f;hb=3e200eb52433b55acacf1072b33b6a60c8952ff3;hp=84cbbcb62d605790db46280ec427e6f9c41abe1c;hpb=1da41232bbb095c380dcc2cfb33b7114f05e8ced;p=vuplus_dvbapp

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
index 84cbbcb..21b214a 100644
--- a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
@@ -50,12 +50,12 @@ IOC_TYPESHIFT = (IOC_NRSHIFT+IOC_NRBITS)
 BLKRRPART = ((0x12<<IOC_TYPESHIFT) | (95<<IOC_NRSHIFT))
 
 def autostart(reason, **kwargs):
+	global bdpoll
 	if reason == 0:
 		print "starting hotplug handler"
 
 		if fileExists('/dev/.udev'):
 			global netlink
-			global bdpoll
 			from enigma import eSocketNotifier, eTimer, ePythonMessagePump
 			import socket
 			from select import POLLIN, POLLPRI
@@ -295,6 +295,12 @@ def autostart(reason, **kwargs):
 			factory = Factory()
 			factory.protocol = Hotplug
 			reactor.listenUNIX("/tmp/hotplug.socket", factory)
+	else:
+		if bdpoll:
+			bdpoll.running = False
+			bdpoll.timeout() # XXX: I assume the timer is shut down before it executes again, so release the semaphore manually
+			bdpoll.join()
+		bdpoll = None
 
 def Plugins(**kwargs):
 	return PluginDescriptor(name = "Hotplug", description = "listens to hotplug events", where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = True, fnc = autostart)