From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Thu, 17 Jul 2008 13:19:36 +0000 (+0000)
Subject: fix defaults for configMode
X-Git-Tag: 2.6.0~1026
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/31ff2df44f294aa9685022e458a0aab7ba7df576

fix defaults for configMode
---

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 596bd5b1..b5df02c5 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -134,7 +134,7 @@ class SecConfigure:
 			nim = slot.config
 			if slot.isCompatible("DVB-S"):
 				print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
-				print "diseqcmode: ", nim.configMode.value
+				print "diseqcmode: ", nim.diseqcMode.value
 				if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:
 					pass
 				else:
@@ -787,23 +787,23 @@ def InitNimManager(nimmgr):
 				choices["satposdepends"] = _("second cable of motorized LNB")
 			if len(nimmgr.canConnectTo(x)) > 0:
 				choices["loopthrough"] = _("loopthrough to")
-			nim.configMode = ConfigSelection(choices = choices, default = "simple")
+			nim.configMode = ConfigSelection(choices = choices, default = "nothing")
 
 			#important - check if just the 2nd one is LT only and the first one is DVB-S
 			# CHECKME: is this logic correct for >2 slots?
-			if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
-				if x == 0: # first one can never be linked to anything
-					# reset to simple
-					nim.configMode.value = "simple"
-					nim.configMode.save()
-				else:
+#			if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
+#				if x == 0: # first one can never be linked to anything
+#					# reset to simple
+#					nim.configMode.value = "simple"
+#					nim.configMode.save()
+#				else:
 					#FIXME: make it better
-					for y in nimmgr.nim_slots:
-						if y.slot == 0:
-							if not y.isCompatible("DVB-S"):
-								# reset to simple
-								nim.configMode.value = "simple"
-								nim.configMode.save()
+			for y in nimmgr.nim_slots:
+				if y.slot == 0:
+					if not y.isCompatible("DVB-S"):
+						# reset to simple
+						nim.configMode.value = "simple"
+						nim.configMode.save()
 
 			nim.diseqcMode = ConfigSelection(
 				choices = [