X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FHotplug%2Fplugin.py;h=e26a93c60bf44f1bff63a3310c4503a968263eae;hb=3687dbc55090f0c5a43d4cc8ca4e6e6c8b200679;hp=1f379f10f495c99ef9b28bc1b6ee7f1c970a2f17;hpb=2b49c99dcd77e5c65d9563b38ed25e3153144818;p=vuplus_dvbapp

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
index 1f379f1..e26a93c 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
@@ -256,6 +256,8 @@ def autostart(reason, **kwargs):
 					self.__lock.release()
 
 			netlink = Netlink()
+			if bdpoll is not None:
+				bdpoll.running = False
 			bdpoll = BDPoll()
 			for blockdev, removable, is_cdrom, medium_found in harddiskmanager.devices_scanned_on_init:
 				if removable or is_cdrom:
@@ -295,6 +297,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, fnc = autostart)
+	return PluginDescriptor(name = "Hotplug", description = "listens to hotplug events", where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = True, fnc = autostart)