X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8b7bd9c03984b5f534a0c50561621c1368d926da..f925e1fc04e179b6626c47170700159ae4212d93:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 8d3afaed..22c99520 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -7,15 +7,9 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 	eDVBSatelliteRotorParameters as rotorParam, \
 	eDVBResourceManager
 
-import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
-from Tools import XMLTools
-
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
-from Tools.BoundFunction import boundFunction
 from time import localtime, mktime
 from datetime import datetime
 
@@ -118,7 +112,7 @@ class SecConfigure:
 				# this is stored in the *value* (not index!) of the config list
 				if nim.configMode.value == "equal":
 					self.equal[int(nim.equalTo.value)]=x
-				if nim.configMode.value == "loopthrough":
+				elif nim.configMode.value == "loopthrough":
 					self.linkNIMs(sec, x, int(nim.linkedTo.value))
 					self.linked[int(nim.linkedTo.value)]=x
 				elif nim.configMode.value == "satposdepends":
@@ -776,17 +770,12 @@ def InitNimManager(nimmgr):
 	for x in range(len(nimmgr.nim_slots)):
 		config.Nims.append(ConfigSubsection())
 
-	used_nim_slots = [ ]
-
 	for slot in nimmgr.nim_slots:
 		x = slot.slot
 		nim = config.Nims[x]
 		
 		# HACK: currently, we can only looptrough to socket A
 
-		if slot.type is not None:
-			used_nim_slots.append((slot.slot, slot.description))
-
 		if slot.isCompatible("DVB-S"):
 			if slot.slot == 0:
 				nim.configMode = ConfigSelection(
@@ -851,7 +840,8 @@ def InitNimManager(nimmgr):
 			etime = datetime(1970, 1, 1, 19, 0);
 			nim.fastTurningEnd = ConfigDateTime(default = mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 900)
 			# get other frontends of the same type
-			satNimList = nimmgr.getNimListOfType(slot.type, slot.slot)
+
+			satNimList = nimmgr.getNimListOfType("DVB-S", slot.slot)
 			satNimListNames = {}
 
 			for x in satNimList: